From 322be0f0c6d4d8eccc15449eb7ad30d7a263ae4d Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 22 Dec 2016 16:24:52 -0800 Subject: Actually including docker settings --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') 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. ", 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 = -- cgit v1.2.3