From 6c8b01403fb474c957f84b520d39104558fc7593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ossowski?= Date: Sun, 22 Oct 2023 13:01:24 +0200 Subject: [PATCH] fix missing web ui files --- build.sbt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index bb71fd59..3ec209ff 100644 --- 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,10 +347,13 @@ 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", "--", @@ -355,7 +361,10 @@ lazy val nativeServer: Project = (project in file("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",