From 5af4bd6453f9cea7af7b66fa5e5aa58649150e13 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Mon, 30 Jul 2018 13:43:15 -0700 Subject: Use default keystore and exit on failure --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 4 ++-- 1 file 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 = -- cgit v1.2.3