diff options
author | Vlad Uspensky <v.uspenskiy@icloud.com> | 2017-03-09 15:46:39 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-09 15:46:39 -0800 |
commit | b00bb83787a3efbb56a6d4c84aeda0b8cbf3848c (patch) | |
tree | 8fb43809c73cb5769b303ab4e83cb4ed85fcf46e | |
parent | 8900264ef8a875ae97fd7468e437012ebd65afbf (diff) | |
parent | 739fe3c24d16ecab33ce2a6a3747dc4e2b203870 (diff) | |
download | sbt-settings-b00bb83787a3efbb56a6d4c84aeda0b8cbf3848c.tar.gz sbt-settings-b00bb83787a3efbb56a6d4c84aeda0b8cbf3848c.tar.bz2 sbt-settings-b00bb83787a3efbb56a6d4c84aeda0b8cbf3848c.zip |
Merge pull request #13 from drivergroup/adambom/keystore
Add keystore generation to docker
-rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index e266f3a..680b49d 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -339,6 +339,7 @@ object SbtSettings extends AutoPlugin { baseImage: String = "openjdk:8-jre-alpine", customCommands: List[String] = List.empty[String], aggregateSubprojects: Boolean = false): Project = { + project .enablePlugins(DockerPlugin, JavaAppPackaging) .settings( @@ -371,7 +372,13 @@ object SbtSettings extends AutoPlugin { val repositoryName = "gcr.io/" + gCloudProject - dockerConfiguration(imageName, repositoryName, exposedPorts, baseImage, dockerCustomCommands, aggregateSubprojects) + val trustStoreConfiguration = + "[ -n \"$TRUSTSTORE\" ] && keytool -import -noprompt -trustcacerts -alias driver-internal -file /etc/$imageName/ssl/issuing_ca -storepass 123456" + + val dockerCommands = + dockerCustomCommands :+ trustStoreConfiguration + + dockerConfiguration(imageName, repositoryName, exposedPorts, baseImage, dockerCommands, aggregateSubprojects) .settings( Seq(resourceGenerators in Test += Def.task { val variablesFile = file("deploy/variables.sh") |