diff options
| author | vlad <vlad@driver.xyz> | 2017-04-27 11:53:28 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-04-27 11:53:28 -0700 |
| commit | cd268a4d1a93e87a0208e6dc72df5773575699ad (patch) | |
| tree | 7a3e10c14aefc689afbe68a65e63381e9fdcc3d1 | |
| parent | 08bd63c4d8e4f67eaec0ab3053b5d174895edcba (diff) | |
| download | sbt-settings-cd268a4d1a93e87a0208e6dc72df5773575699ad.tar.gz sbt-settings-cd268a4d1a93e87a0208e6dc72df5773575699ad.tar.bz2 sbt-settings-cd268a4d1a93e87a0208e6dc72df5773575699ad.zip | |
Trying to add truststore import as part of the run script using sbt-docker `bashScriptExtraDefines`
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index c70409b..acc0a53 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -48,7 +48,7 @@ object SbtSettings extends AutoPlugin { Seq(formatConfFile) }.taskValue, scalafmtTest := { - s"${baseDirectory.value.getPath}/scalafmt --test".! + s"chmod +x ${baseDirectory.value.getPath}/scalafmt && ${baseDirectory.value.getPath}/scalafmt --test".! }, testExecution in (Test, test) <<= (testExecution in (Test, test)) dependsOn (scalafmtTest in Compile, scalafmtTest in Test) @@ -265,10 +265,10 @@ object SbtSettings extends AutoPlugin { val importTrustStoreCommand = s"if [ -f /etc/$imageName/ssl/issuing_ca ] ; then " + keytoolCommand + "; else echo \"No truststore customization.\"; fi" - val dockerCommands = dockerCustomCommands :+ importTrustStoreCommand + val dockerCommands = dockerCustomCommands // :+ importTrustStoreCommand dockerConfiguration(imageName, repositoryName, exposedPorts, baseImage, dockerCommands, aggregateSubprojects) - // .settings(NativePackagerKeys.bashScriptExtraDefines += importTrustStoreCommand) + .settings(NativePackagerKeys.bashScriptExtraDefines += importTrustStoreCommand) } def driverLibrary(libraryName: String): Project = { |