From 144923143b9eda1003fedce5761b05ac6f4e430e Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 2 Mar 2017 11:00:41 -0800 Subject: Custom commands parametrization --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 47c763d..abb7377 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -336,7 +336,8 @@ object SbtSettings extends AutoPlugin { def dockerConfiguration(imageName: String, repository: String, exposedPorts: Seq[Int], - baseImage: String = "java:8-jre-alpine", + baseImage: String = "openjdk:8-jre", + customCommands: List[String] = List.empty[String], aggregateSubprojects: Boolean = false): Project = { project .enablePlugins(DockerPlugin, JavaAppPackaging) @@ -350,7 +351,7 @@ object SbtSettings extends AutoPlugin { dockerExposedPorts := exposedPorts, dockerBaseImage := baseImage, dockerCommands := dockerCommands.value.flatMap { // @see http://blog.codacy.com/2015/07/16/dockerizing-scala/ - case cmd@Cmd("FROM", _) => List(cmd, Cmd("RUN", "apk update && apk add bash ttf-dejavu")) + case cmd@Cmd("FROM", _) => cmd :: customCommands.map(customCommand => Cmd("RUN", customCommand)) case other => List(other) }, aggregate in Docker := aggregateSubprojects // to include subprojects @@ -364,12 +365,14 @@ object SbtSettings extends AutoPlugin { clusterName: String = "dev-uw1a-1", clusterZone: String = "us-west1-a", gCloudProject: String = "driverinc-dev", - baseImage: String = "java:8-jre-alpine", + baseImage: String = "openjdk:8-jre", + dockerCustomCommands: List[String] = List.empty[String], aggregateSubprojects: Boolean = false) = { val repositoryName = "gcr.io/" + gCloudProject - dockerConfiguration(imageName, repositoryName, exposedPorts, baseImage, aggregateSubprojects).settings( + dockerConfiguration(imageName, repositoryName, exposedPorts, baseImage, dockerCustomCommands, aggregateSubprojects) + .settings( Seq(resourceGenerators in Test += Def.task { val variablesFile = file("deploy/variables.sh") val contents = -- cgit v1.2.3