diff options
| author | vlad <vlad@driver.xyz> | 2017-03-10 10:55:03 -0800 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-03-10 10:55:03 -0800 |
| commit | 12035aafc23cb12ee5021655d22f462cc928aab1 (patch) | |
| tree | 63307aa1d86d4d0debb933e32c8026c80beb9524 | |
| parent | 599d1e161796b228e83ace149d8d050e79caf023 (diff) | |
| download | sbt-settings-12035aafc23cb12ee5021655d22f462cc928aab1.tar.gz sbt-settings-12035aafc23cb12ee5021655d22f462cc928aab1.tar.bz2 sbt-settings-12035aafc23cb12ee5021655d22f462cc928aab1.zip | |
Change in keytool command
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 680b49d..68f7474 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -372,9 +372,12 @@ object SbtSettings extends AutoPlugin { val repositoryName = "gcr.io/" + gCloudProject + val keytoolCommand = + s"keytool -import -noprompt -trustcacerts -alias driver-internal -file /etc/$imageName/ssl/issuing_ca -storepass 123456" + val trustStoreConfiguration = - "[ -n \"$TRUSTSTORE\" ] && keytool -import -noprompt -trustcacerts -alias driver-internal -file /etc/$imageName/ssl/issuing_ca -storepass 123456" - + "if [ -n \"$TRUSTSTORE\" ] ; " + keytoolCommand + "; else echo \"No truststore customization.\"; fi" + val dockerCommands = dockerCustomCommands :+ trustStoreConfiguration |