aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2017-04-28 14:41:22 -0700
committervlad <vlad@driver.xyz>2017-04-28 14:41:22 -0700
commitfd7a2b2d7bdff1da516c560b064475f8fdfff270 (patch)
tree42bf299c0e752f6402ad69be2e8c1e93a5db3b16
parented2cd8ec6490f9503cfae4238bd661d412b88c11 (diff)
downloadsbt-settings-fd7a2b2d7bdff1da516c560b064475f8fdfff270.tar.gz
sbt-settings-fd7a2b2d7bdff1da516c560b064475f8fdfff270.tar.bz2
sbt-settings-fd7a2b2d7bdff1da516c560b064475f8fdfff270.zip
Changing Docker user to root
-rw-r--r--build.sbt2
-rw-r--r--src/main/scala/xyz.driver.sbt/SbtSettings.scala2
2 files changed, 3 insertions, 1 deletions
diff --git a/build.sbt b/build.sbt
index 944d1ad..cf1fabf 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,7 +16,7 @@ addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5")
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4")
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.5")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.0")
diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
index 018374e..0dee684 100644
--- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala
+++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala
@@ -224,6 +224,7 @@ object SbtSettings extends AutoPlugin {
baseImage: String = "java:8",
customCommands: List[String] = List.empty[String],
aggregateSubprojects: Boolean = false): Project = {
+ import com.typesafe.sbt.packager.Keys._
project
.enablePlugins(DockerPlugin, JavaAppPackaging)
@@ -236,6 +237,7 @@ object SbtSettings extends AutoPlugin {
dockerUpdateLatest := true, // to automatic update the latest tag
dockerExposedPorts := exposedPorts,
dockerBaseImage := baseImage,
+ daemonUser in Docker := "root",
dockerCommands := dockerCommands.value.flatMap { // @see http://blog.codacy.com/2015/07/16/dockerizing-scala/
case cmd@Cmd("FROM", _) => cmd :: customCommands.map(customCommand => Cmd("RUN", customCommand))
case other => List(other)