fix missing web ui files

softwaremill · Oct 22, 2023 · 6c8b014 · 6c8b014
1 parent 36b28d1
commit 6c8b014
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -244,7 +244,10 @@ lazy val server: Project = (project in file("server"))
       dockerBaseImage := "openjdk:11-jdk-stretch",
       Docker / packageName := "elasticmq",
       dockerUsername := Some("softwaremill"),
-      dockerUpdateLatest := true,
+      dockerUpdateLatest := {
+//        !version.value.toLowerCase.contains("rc")
+        false
+      },
       Universal / javaOptions ++= Seq("-Dconfig.file=/opt/elasticmq.conf"),
       Docker / mappings ++= Seq(
         (baseDirectory.value / "docker" / "elasticmq.conf") -> "/opt/elasticmq.conf"
@@ -344,18 +347,24 @@ lazy val nativeServer: Project = (project in file("native-server"))
 
         graalVmBuildCommands ++ updatedCommands
       },
+      Docker / defaultLinuxInstallLocation := "/opt/elasticmq",
       Docker / mappings ++= Seq(
         (baseDirectory.value / ".." / "server" / "docker" / "elasticmq.conf") -> "/opt/elasticmq/elasticmq.conf",
-        (baseDirectory.value / ".." / "server" / "src" / "main" / "resources" / "logback.xml") -> "/opt/elasticmq/logback.xml"
-      ) ++ sbt.Path.directory(baseDirectory.value / ".." / "ui" / "build"),
+        (baseDirectory.value / ".." / "server" / "src" / "main" / "resources" / "logback.xml") -> "/opt/elasticmq/logback.xml",
+      ) ++ sbt.Path.contentOf(baseDirectory.value / ".." / "ui" / "build").map {
+        case (file, mapping) => (file, "/opt/elasticmq/" + mapping)
+      },
       dockerEntrypoint := Seq(
         "/sbin/tini",
         "--",
         "/opt/elasticmq/bin/elasticmq-native-server",
         "-Dconfig.file=/opt/elasticmq/elasticmq.conf",
         "-Dlogback.configurationFile=/opt/elasticmq/logback.xml"
       ),
-      dockerUpdateLatest := true,
+      dockerUpdateLatest := {
+//        !version.value.toLowerCase.contains("rc")
+        false
+      },
       dockerExposedPorts := Seq(9324, 9325),
       dockerUsername := Some("softwaremill"),
       dockerExposedVolumes += "/data",