Fix #1464 (#1465)

* Fix #1464 * fmt * fmt * fmt Co-authored-by: Nepomuk Seiler <muuki88@users.noreply.github.com>
sbt · Oct 14, 2021 · 89c3180 · 89c3180
1 parent 54c3106
commit 89c3180
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala
@@ -94,16 +94,16 @@ object DockerPlugin extends AutoPlugin {
 
   override lazy val projectSettings: Seq[Setting[_]] = Seq(
     dockerAlias := DockerAlias(
-      (dockerRepository in Docker).value,
-      (dockerUsername in Docker).value,
-      (packageName in Docker).value,
-      Option((version).value)
+      (Docker / dockerRepository).value,
+      (Docker / dockerUsername).value,
+      (Docker / packageName).value,
+      Option((Docker / version).value)
     ),
     dockerLayerGrouping := { _: String =>
       None
     },
     dockerGroupLayers := {
-      val dockerBaseDirectory = (defaultLinuxInstallLocation in Docker).value
+      val dockerBaseDirectory = (Docker / defaultLinuxInstallLocation).value
       // Ensure this doesn't break even if the JvmPlugin isn't enabled.
       var artifacts = projectDependencyArtifacts.?.value.getOrElse(Nil).map(_.data).toSet
 
@@ -140,7 +140,7 @@ object DockerPlugin extends AutoPlugin {
       else
         Seq(alias)
     },
-    dockerEntrypoint := Seq(s"${(defaultLinuxInstallLocation in Docker).value}/bin/${executableScriptName.value}"),
+    dockerEntrypoint := Seq(s"${(Docker / defaultLinuxInstallLocation).value}/bin/${executableScriptName.value}"),
     dockerVersion := Try(
       Process(dockerExecCommand.value ++ Seq("version", "--format", "'{{.Server.Version}}'")).!!
     ).toOption
@@ -158,8 +158,8 @@ object DockerPlugin extends AutoPlugin {
     dockerRmiCommand := dockerExecCommand.value ++ Seq("rmi"),
     dockerBuildCommand := dockerExecCommand.value ++ Seq("build") ++ dockerBuildOptions.value ++ Seq("."),
     dockerAdditionalPermissions := {
-      val basePath = (defaultLinuxInstallLocation in Docker).value
-      (dockerLayerMappings in Docker).value
+      val basePath = (Docker / defaultLinuxInstallLocation).value
+      (Docker / dockerLayerMappings).value
         .collect {
           // by default we assume everything in the bin/ folder should be executable that is not a .bat file
           case LayeredMapping(_, _, path) if path.startsWith(s"$basePath/bin/") && !path.endsWith(".bat") =>
@@ -171,17 +171,17 @@ object DockerPlugin extends AutoPlugin {
     },
     dockerCommands := {
       val strategy = dockerPermissionStrategy.value
-      val dockerBaseDirectory = (defaultLinuxInstallLocation in Docker).value
-      val user = (daemonUser in Docker).value
-      val uidOpt = (daemonUserUid in Docker).value
-      val group = (daemonGroup in Docker).value
-      val gidOpt = (daemonGroupGid in Docker).value
+      val dockerBaseDirectory = (Docker / defaultLinuxInstallLocation).value
+      val user = (Docker / daemonUser).value
+      val uidOpt = (Docker / daemonUserUid).value
+      val group = (Docker / daemonGroup).value
+      val gidOpt = (Docker / daemonGroupGid).value
       val base = dockerBaseImage.value
       val addPerms = dockerAdditionalPermissions.value
       val multiStageId = UUID.randomUUID().toString
-      val generalCommands = makeFromAs(base, "mainstage") +: makeMaintainer((maintainer in Docker).value).toSeq
+      val generalCommands = makeFromAs(base, "mainstage") +: makeMaintainer((Docker / maintainer).value).toSeq
       val stage0name = "stage0"
-      val layerMappings = (dockerLayerMappings in Docker).value
+      val layerMappings = (Docker / dockerLayerMappings).value
       val layerIdsAscending = layerMappings.map(_.layerId).distinct.sortWith { (a, b) =>
         // Make the None (unspecified) layer the last layer
         a.getOrElse(Int.MaxValue) < b.getOrElse(Int.MaxValue)
@@ -198,7 +198,7 @@ object DockerPlugin extends AutoPlugin {
             Seq(makeUser("root")) ++ layerIdsAscending.map(
             l => makeChmodRecursive(dockerChmodType.value, Seq(pathInLayer(dockerBaseDirectory, l)))
           ) ++ {
-            val layerToPath = (dockerGroupLayers in Docker).value
+            val layerToPath = (Docker / dockerGroupLayers).value
             addPerms map {
               case (tpe, v) =>
                 // Try and find the source file for the path from the mappings
@@ -309,10 +309,10 @@ object DockerPlugin extends AutoPlugin {
         }
       ),
       stage := (stage dependsOn dockerGenerateConfig).value,
-      stagingDirectory := (target in Docker).value / "stage",
+      stagingDirectory := (Docker / target).value / "stage",
       dockerLayerMappings := {
         val dockerGroups = dockerGroupLayers.value
-        val dockerFinalFiles = (mappings in Docker).value
+        val dockerFinalFiles = (Docker / mappings).value
         for {
           mapping @ (file, path) <- dockerFinalFiles
           layerIdx = dockerGroups.lift(mapping)
@@ -329,8 +329,8 @@ object DockerPlugin extends AutoPlugin {
       validatePackage := Validation
         .runAndThrow(validatePackageValidators.value, streams.value.log),
       validatePackageValidators := Seq(
-        nonEmptyMappings((mappings in Docker).value),
-        filesExist((mappings in Docker).value),
+        nonEmptyMappings((Docker / mappings).value),
+        filesExist((Docker / mappings).value),
         validateExposedPorts(dockerExposedPorts.value, dockerExposedUdpPorts.value),
         validateDockerVersion(dockerApiVersion.value),
         validateDockerPermissionStrategy(dockerPermissionStrategy.value, dockerVersion.value, dockerApiVersion.value)
@@ -583,7 +583,7 @@ object DockerPlugin extends AutoPlugin {
 
   /**
     * uses the `mappings in Universal` to generate the
-    * `mappings in Docker`.
+    * `Docker / mappings`.
     */
   def mapGenericFilesToDocker: Seq[Setting[_]] = {
     def renameDests(from: Seq[(File, String)], dest: String) =