aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2018-07-30 13:43:15 -0700
committerJakob Odersky <jakob@driver.xyz>2018-07-30 13:44:29 -0700
commit5af4bd6453f9cea7af7b66fa5e5aa58649150e13 (patch)
treee8879cb17b2c42a214813bb7943708d444d64463
parentddcefdd6f887ee488dd3a2ae9bd2eb4a09ef7550 (diff)
downloadsbt-settings-5af4bd6453f9cea7af7b66fa5e5aa58649150e13.tar.gz
sbt-settings-5af4bd6453f9cea7af7b66fa5e5aa58649150e13.tar.bz2
sbt-settings-5af4bd6453f9cea7af7b66fa5e5aa58649150e13.zip
Use default keystore and exit on failurev1.0.14
-rw-r--r--src/main/scala/xyz.driver.sbt/SbtSettings.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
index 86a6823..88d736e 100644
--- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala
+++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
@@ -308,8 +308,8 @@ object SbtSettings extends AutoPlugin {
val repositoryName = "gcr.io/" + gCloudProject
val keytoolCommand =
- "keytool -import -alias driverincInternal -keystore $JAVA_HOME/jre/lib/security/cacerts " +
- s"-file /etc/$imageName/ssl/issuing_ca -storepass changeit -noprompt"
+ "keytool -import -alias driverincInternal -trustcacerts " +
+ s"-file /etc/$imageName/ssl/issuing_ca -storepass changeit -noprompt || exit 1"
// If issuing_ca exists, import it into the internal default ca store
val importTrustStoreCommand =