Skip to content

Commit 9f4e1e0

Browse files
Fix ci publish
1 parent cef85ec commit 9f4e1e0

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

project/src/main/scala/definitions/AdminServer.scala

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import com.typesafe.sbt.packager.archetypes.JavaAppPackaging
44
import com.typesafe.sbt.packager.docker.Cmd
55
import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport._
66
import com.typesafe.sbt.packager.universal.UniversalDeployPlugin
7-
import common.Libs
8-
import common.CommonPlayModule
7+
import common.{CommonPlayModule, Libs}
98
import sbt.Keys._
109
import sbt._
1110
import webscalajs.WebScalaJS.autoImport._
@@ -33,16 +32,23 @@ object AdminServer extends AdminModule with CommonPlayModule {
3332
//dockerImageCreationTask := (publishLocal in Docker).value,
3433
dockerBaseImage := "openjdk:9-slim",
3534
mappings in (Compile, packageDoc) := Seq(),
35+
publishArtifact in (Compile, packageDoc) := false,
3636

37-
dockerCommands := (dockerCommands.value match {
38-
case Seq(from@Cmd("FROM", _), rest@_*) =>
39-
Seq(
40-
from,
41-
//set JVM TTL, see https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/java-dg-jvm-ttl.html
42-
Cmd("RUN", "mkdir", "-p", "$JAVA_HOME/jre/lib/security"),
43-
Cmd("RUN", "echo", "networkaddress.cache.ttl=60", ">>", "$JAVA_HOME/jre/lib/security/java.security")
44-
) ++ rest
45-
})
37+
dockerCommands := {
38+
val commands = dockerCommands.value
39+
val lines = commands.map(_.makeContent)
40+
val splitIndex = lines.indexWhere(_.startsWith("COPY --from=stage0"))
41+
if (splitIndex < 0) {
42+
throw new IllegalStateException(s"Expected COPY --from=stage0 command in Dockerfile:\n${lines.mkString}")
43+
}
44+
45+
val (part1, part2) = commands.splitAt(splitIndex)
46+
part1 ++ Seq(
47+
//set JVM TTL, see https://docs.aws.amazon.com/sdk-for-java/v1/developer-guide/java-dg-jvm-ttl.html
48+
Cmd("RUN", "mkdir", "-p", "$JAVA_HOME/jre/lib/security"),
49+
Cmd("RUN", "echo", "networkaddress.cache.ttl=60", ">>", "$JAVA_HOME/jre/lib/security/java.security")
50+
) ++ part2
51+
}
4652
)
4753
}
4854

server/src/main/scala/scommons/admin/server/LiquibaseModule.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ class PlayLiquibase @Inject()(environment: Environment, config: Configuration, i
134134
protected def liquibase(): Option[Liquibase] = {
135135
var missingRequiredParam = false
136136

137-
/** get p parameter from cfg.
137+
/*
138+
* get p parameter from cfg.
138139
* If not found use defValue
139140
*
140141
* @param p parameter get value for

0 commit comments

Comments
 (0)