diff options
| author | vlad <vlad@driver.xyz> | 2017-04-28 13:44:42 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-04-28 13:44:42 -0700 |
| commit | 982df1963611272785a246aed8807fd641df8b30 (patch) | |
| tree | 375f427059e3dba149832a8fb963d99b9885b40c | |
| parent | f9538822635b33b146357d1c94316d29e75166b6 (diff) | |
| download | sbt-settings-982df1963611272785a246aed8807fd641df8b30.tar.gz sbt-settings-982df1963611272785a246aed8807fd641df8b30.tar.bz2 sbt-settings-982df1963611272785a246aed8807fd641df8b30.zip | |
Updating deployment to a standard Docker java:8 image
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index fa67223..018374e 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -221,7 +221,7 @@ object SbtSettings extends AutoPlugin { def dockerConfiguration(imageName: String, repository: String, exposedPorts: Seq[Int], - baseImage: String = "openjdk:8-jre-alpine", + baseImage: String = "java:8", customCommands: List[String] = List.empty[String], aggregateSubprojects: Boolean = false): Project = { @@ -251,14 +251,14 @@ object SbtSettings extends AutoPlugin { clusterName: String = "sand-uw1a-1", clusterZone: String = "us-west1-a", gCloudProject: String = "driverinc-sandbox", - baseImage: String = "java:openjdk-8-jre-alpine", + baseImage: String = "java:8", dockerCustomCommands: List[String] = List.empty[String], aggregateSubprojects: Boolean = false) = { val repositoryName = "gcr.io/" + gCloudProject val keytoolCommand = - "keytool -import -alias driverincInternal -keystore $JAVA_HOME/lib/security/cacerts " + + "keytool -import -alias driverincInternal -keystore $JAVA_HOME/jre/lib/security/cacerts " + s"-file /etc/$imageName/ssl/issuing_ca -storepass changeit -noprompt" // If issuing_ca exists, import it into the internal default ca store @@ -283,7 +283,7 @@ object SbtSettings extends AutoPlugin { clusterName: String = "sand-uw1a-1", clusterZone: String = "us-west1-a", gCloudProject: String = "driverinc-sandbox", - baseImage: String = "java:openjdk-8-jre-alpine", + baseImage: String = "java:8", dockerCustomCommands: List[String] = List.empty[String], aggregateSubprojects: Boolean = false): Project = { project |