Revert "Make docker builds able to COPY custom files in (#1931)"

This reverts commit 8df8933.

Author: joan38

contrib/bloop/test/src/mill/contrib/bloop/BloopTests.scala

@@ -89,7 +89,8 @@ object BloopTests extends TestSuite {
         if (scala.util.Properties.isWin) None else Some(readBloopConf("scalanativeModule.json"))
 
       "no-compilation" - {
-        val workspaceOut = os.pwd / "target" / "workspace" / "bloop" / "out"
+        val workspaceOut =
+          os.pwd / "target" / "workspace" / "mill" / "contrib" / "bloop" / "BloopTests" / "testEvaluator"
 
         // Ensuring that bloop config generation didn't trigger compilation
         assert(os.exists(workspaceOut / "scalaModule"))

contrib/docker/src/DockerModule.scala

@@ -85,6 +85,7 @@ trait DockerModule { outer: JavaModule =>
     }
 
     def dockerfile: T[String] = T {
+      val jarName = assembly().path.last
       val labelRhs = labels()
         .map { case (k, v) =>
           val lineBrokenValue = v
@@ -112,25 +113,30 @@ trait DockerModule { outer: JavaModule =>
         if (user().isEmpty) "" else s"USER ${user()}"
       ).filter(_.nonEmpty).mkString(sys.props("line.separator"))
 
-      s"""FROM ${baseImage()}
+      s"""
+         |FROM ${baseImage()}
          |$lines
-         |COPY ["${assembly().path}", "/${assembly().path.last}"]
-         |ENTRYPOINT ["java", "-jar", "/${assembly().path.last}"]""".stripMargin
+         |COPY $jarName /$jarName
+         |ENTRYPOINT ["java", "-jar", "/$jarName"]""".stripMargin
     }
 
     final def build = T {
-      val log = T.log
-      val dockerfilePath = T.dest / "Dockerfile"
+      val dest = T.dest
+
+      val asmPath = outer.assembly().path
+      os.copy(asmPath, dest / asmPath.last)
 
-      os.write(dockerfilePath, dockerfile().replace(T.workspace.toString, ""))
+      os.write(dest / "Dockerfile", dockerfile())
+
+      val log = T.log
 
       val tagArgs = tags().flatMap(t => List("-t", t))
 
       val (pull, _) = baseImageCacheBuster()
       val pullLatestBase = IterableShellable(if (pull) Some("--pull") else None)
 
       val result = os
-        .proc(executable(), "build", tagArgs, pullLatestBase, "-f", dockerfilePath, T.workspace)
+        .proc(executable(), "build", tagArgs, pullLatestBase, dest)
         .call(stdout = os.Inherit, stderr = os.Inherit)
 
       log.info(s"Docker build completed ${if (result.exitCode == 0) "successfully"

contrib/docker/test/src/DockerModuleTest.scala

@@ -95,9 +95,10 @@ object DockerModuleTest extends TestSuite {
         val eval = new TestEvaluator(Docker)
         val Right((dockerfileString, _)) = eval(Docker.dockerDefault.dockerfile)
         val expected = multineRegex.replaceAllIn(
-          s"""FROM gcr.io/distroless/java:latest
-             |COPY ["${Docker.millSourcePath / "out" / "dockerfile contents" / "default options" / "assembly.dest" / "out.jar"}", "/out.jar"]
-             |ENTRYPOINT ["java", "-jar", "/out.jar"]""".stripMargin,
+          """
+            |FROM gcr.io/distroless/java:latest
+            |COPY out.jar /out.jar
+            |ENTRYPOINT ["java", "-jar", "/out.jar"]""".stripMargin,
           sys.props("line.separator")
         )
         val dockerfileStringRefined = multineRegex.replaceAllIn(
@@ -111,18 +112,19 @@ object DockerModuleTest extends TestSuite {
         val eval = new TestEvaluator(Docker)
         val Right((dockerfileString, _)) = eval(Docker.dockerAll.dockerfile)
         val expected = multineRegex.replaceAllIn(
-          s"""FROM docker.io/openjdk:11
-             |LABEL "version"="1.0"
-             |EXPOSE 8080/tcp 443/tcp
-             |EXPOSE 80/udp
-             |ENV foo=bar
-             |ENV foobar=barfoo
-             |VOLUME ["/v1", "/v2"]
-             |RUN /bin/bash -c 'echo Hello World!'
-             |RUN useradd -ms /bin/bash user1
-             |USER user1
-             |COPY ["${Docker.millSourcePath / "out" / "dockerfile contents" / "all options" / "assembly.dest" / "out.jar"}", "/out.jar"]
-             |ENTRYPOINT ["java", "-jar", "/out.jar"]""".stripMargin,
+          """
+            |FROM docker.io/openjdk:11
+            |LABEL "version"="1.0"
+            |EXPOSE 8080/tcp 443/tcp
+            |EXPOSE 80/udp
+            |ENV foo=bar
+            |ENV foobar=barfoo
+            |VOLUME ["/v1", "/v2"]
+            |RUN /bin/bash -c 'echo Hello World!'
+            |RUN useradd -ms /bin/bash user1
+            |USER user1
+            |COPY out.jar /out.jar
+            |ENTRYPOINT ["java", "-jar", "/out.jar"]""".stripMargin,
           sys.props("line.separator")
         )
         val dockerfileStringRefined = multineRegex.replaceAllIn(

contrib/scoverage/test/src/HelloWorldTests.scala

@@ -115,7 +115,7 @@ trait HelloWorldTests extends utest.TestSuite {
 
             assert(
               result.path.toIO.getPath.replace("""\""", "/").endsWith(
-                "mill/target/worksources/mill/contrib/scoverage/HelloWorldTests#HelloWorld/out/HelloWorld/core/scoverage/data/core/scoverage/data.dest"
+                "mill/target/workspace/mill/contrib/scoverage/HelloWorldTests/eval/HelloWorld/core/scoverage/data/core/scoverage/data.dest"
               ),
               evalCount > 0
             )

docs/antora/modules/ROOT/pages/Plugin_Docker.adoc

@@ -61,13 +61,6 @@ object docker extends DockerConfig {
   def user = "new-user"
   // Optionally override the docker executable to use something else
   def executable = "podman"
-  // Optionally override the content of the Dockerfile. Note: All paths need to be absolute and located within the project.
-  def dockerfile =
-    s"""FROM ${baseImage()}
-       |RUN aptitude install -y pidgin
-       |COPY ${assembly().path} /${assembly().path.last}
-       |ENTRYPOINT ["java", "-jar", "/${assembly().path.last}"]""".stripMargin
-       |""".stripMargin
 }
 ----
 

main/test/src/eval/TaskTests.scala

@@ -209,12 +209,11 @@ object SeqTaskTests extends TaskTests {
 object ParTaskTests extends TaskTests {
   def withEnv(f: (Build, TestEvaluator) => Unit)(implicit tp: TestPath) = {
     object build extends Build
-    val check =
-      new TestEvaluator(
-        build,
-        threads = Some(16),
-        extraPathEnd = Seq(getClass().getSimpleName())
-      )
+    val check = new TestEvaluator(
+      build,
+      threads = Some(16),
+      extraPathEnd = Seq(getClass().getSimpleName())
+    )
     f(build, check)
   }
 }

main/testkit/src/testkit/MillTestkit.scala

@@ -72,7 +72,7 @@ trait MillTestKit {
       debugEnabled: Boolean = false,
       extraPathEnd: Seq[String] = Seq.empty
   )(implicit fullName: sourcecode.FullName) {
-    val outPath = module.millSourcePath / "out" / testPath / extraPathEnd
+    val outPath = getOutPath(testPath) / extraPathEnd
 
 //  val logger = DummyLogger
     val logger = new mill.util.PrintLogger(