From fd7a2b2d7bdff1da516c560b064475f8fdfff270 Mon Sep 17 00:00:00 2001 From: vlad Date: Fri, 28 Apr 2017 14:41:22 -0700 Subject: Changing Docker user to root --- build.sbt | 2 +- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3