diff options
| author | vlad <vlad@drivergrp.com> | 2016-12-22 16:24:52 -0800 |
|---|---|---|
| committer | vlad <vlad@drivergrp.com> | 2016-12-22 16:24:52 -0800 |
| commit | 322be0f0c6d4d8eccc15449eb7ad30d7a263ae4d (patch) | |
| tree | b355fc71db20019988df7e3b847b17b94479f5be | |
| parent | 489fd67dfb636a18446e0f52af124462ee52baf7 (diff) | |
| download | sbt-settings-322be0f0c6d4d8eccc15449eb7ad30d7a263ae4d.tar.gz sbt-settings-322be0f0c6d4d8eccc15449eb7ad30d7a263ae4d.tar.bz2 sbt-settings-322be0f0c6d4d8eccc15449eb7ad30d7a263ae4d.zip | |
Actually including docker settings
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 10ca365..a23d386 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -342,7 +342,7 @@ object SbtSettings extends AutoPlugin { .settings( // Settings reference http://www.scala-sbt.org/sbt-native-packager/formats/docker.html packageName in Docker := imageName, - // version in Docker := version.value.stripSuffix("-SNAPSHOT"), + version in Docker := version.value.stripSuffix("-SNAPSHOT"), dockerRepository := Some(repository), maintainer := "Direct Inc. <info@driver.xyz>", dockerUpdateLatest := true, // to automatic update the latest tag @@ -367,9 +367,7 @@ object SbtSettings extends AutoPlugin { val repositoryName = "gcr.io/" + gCloudProject - dockerConfiguration(imageName, repositoryName, exposedPorts, aggregateSubprojects) - - project.settings( + dockerConfiguration(imageName, repositoryName, exposedPorts, aggregateSubprojects).settings( Seq(resourceGenerators in Test += Def.task { val variablesFile = file("deploy/variables.sh") val contents = |