Merge pull request #424 from huntc/docker-stage

Docker mappings - incomplete?

src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala

@@ -41,7 +41,7 @@ import SbtNativePackager.Universal
  * Future versions of the Docker Plugin may use the REST API, so you don't need docker installed
  * locally.
  *
- * @note this plugin is not inteded to build very customizable docker images, but turn your mappings
+ * @note this plugin is not intended to build very customizable docker images, but turn your mappings
  * configuration in a docker image with almost no ''any'' configuration.
  *
  * @example Enable the plugin in the `build.sbt`
@@ -63,46 +63,45 @@ object DockerPlugin extends AutoPlugin {
     dockerBaseImage := "dockerfile/java:latest",
     dockerExposedPorts := Seq(),
     dockerExposedVolumes := Seq(),
-    name in Docker <<= name,
-    packageName in Docker <<= packageName,
-    executableScriptName in Docker <<= executableScriptName,
     dockerRepository := None,
     dockerUpdateLatest := false,
-    sourceDirectory in Docker <<= sourceDirectory apply (_ / "docker"),
-    target in Docker <<= target apply (_ / "docker"),
     dockerEntrypoint := Seq("bin/%s" format executableScriptName.value)
 
   ) ++ mapGenericFilesToDocker ++ inConfig(Docker)(Seq(
+      executableScriptName := executableScriptName.value,
+      mappings ++= dockerPackageMappings.value,
+      mappings ++= Seq(dockerGenerateConfig.value) pair relativeTo(target.value),
+      name := name.value,
+      packageName := packageName.value,
+      publishLocal <<= (stage, dockerTarget, dockerUpdateLatest, streams) map {
+        (context, target, updateLatest, s) =>
+          publishLocalDocker(context, target, updateLatest, s.log)
+      },
+      publish <<= (publishLocal, dockerTarget, dockerUpdateLatest, streams) map {
+        (_, target, updateLatest, s) =>
+          publishDocker(target, s.log)
+          if (updateLatest) {
+            val name = target.substring(0, target.lastIndexOf(":")) + ":latest"
+            publishDocker(name, s.log)
+          }
+      },
+      sourceDirectory := sourceDirectory.value / "docker",
+      stage <<= (streams, stagingDirectory, mappings) map Stager.stage(Docker.name),
+      stagingDirectory := (target in Docker).value / "stage",
+      target := target.value / "docker",
+
       daemonUser := "daemon",
       defaultLinuxInstallLocation := "/opt/docker",
-      dockerPackageMappings <<= (sourceDirectory) map { dir =>
+
+      dockerPackageMappings <<= sourceDirectory map { dir =>
         MappingsHelper contentOf dir
       },
-      mappings <++= dockerPackageMappings,
-      stage <<= (dockerGenerateConfig, dockerGenerateContext, streams) map {
-        (dockerfile, contextDir, s) =>
-          s.log.success("created docker file: " + dockerfile.getPath)
-          contextDir
-      },
       dockerGenerateConfig <<= (dockerBaseImage, defaultLinuxInstallLocation,
         maintainer, daemonUser, executableScriptName,
         dockerExposedPorts, dockerExposedVolumes, target, dockerEntrypoint) map generateDockerConfig,
-      dockerGenerateContext := Stager.stage("docker")(streams.value, target.value / "files", mappings.value),
       dockerTarget <<= (dockerRepository, packageName, version) map {
         (repo, name, version) =>
           repo.map(_ + "/").getOrElse("") + name + ":" + version
-      },
-      publishLocal <<= (dockerGenerateConfig, dockerGenerateContext, dockerTarget, dockerUpdateLatest, streams) map {
-        (config, _, target, updateLatest, s) =>
-          publishLocalDocker(config, target, updateLatest, s.log)
-      },
-      publish <<= (publishLocal, dockerTarget, dockerUpdateLatest, streams) map {
-        (_, target, updateLatest, s) =>
-          publishDocker(target, s.log)
-          if (updateLatest) {
-            val name = target.substring(0, target.lastIndexOf(":")) + ":latest"
-            publishDocker(name, s.log)
-          }
       }
     ))
 
@@ -117,9 +116,10 @@ object DockerPlugin extends AutoPlugin {
     }
 
     val dockerCommands = Seq(
-      Cmd("ADD", "files /"),
+      Cmd("ADD", "* /"),
       Cmd("WORKDIR", "%s" format dockerBaseDirectory),
       ExecCmd("RUN", "chown", "-R", daemonUser, "."),
+      ExecCmd("RUN", "rm", "/Dockerfile"),
       Cmd("USER", daemonUser),
       ExecCmd("ENTRYPOINT", entrypoint: _*),
       ExecCmd("CMD")

src/main/scala/com/typesafe/sbt/packager/docker/Keys.scala

@@ -9,7 +9,6 @@ import sbt._
  */
 trait DockerKeys {
   val dockerGenerateConfig = TaskKey[File]("docker-generate-config", "Generates configuration file for Docker.")
-  val dockerGenerateContext = TaskKey[File]("docker-generate-context", "Generates context directory for Docker.")
   val dockerPackageMappings = TaskKey[Seq[(File, String)]]("docker-package-mappings", "Generates location mappings for Docker build.")
   val dockerTarget = TaskKey[String]("docker-target", "Defines target used when building and publishing Docker image")
 

src/sbt-test/docker/staging/test

@@ -1,4 +1,4 @@
 # Stage the distribution and ensure files show up.
 > docker:stage
-$ exists target/docker/Dockerfile
-$ exists target/docker/files
+$ exists target/docker/stage/Dockerfile
+$ exists target/docker/stage/opt

src/sbt-test/docker/test-executableScriptName/test

@@ -1,6 +1,6 @@
 # Generate the Docker image locally
 > docker:publishLocal
-$ exists target/docker/Dockerfile
-$ exists target/docker/files/opt/docker/bin/docker-exec
+$ exists target/docker/stage/Dockerfile
+$ exists target/docker/stage/opt/docker/bin/docker-exec
 > check-dockerfile
 $ exec bash -c 'docker run docker-package:0.1.0 | grep -q "Hello world"'

src/sbt-test/docker/test-packageName-universal/test

@@ -1,6 +1,6 @@
 # Generate the Docker image locally
 > docker:publishLocal
-$ exists target/docker/Dockerfile
-$ exists target/docker/files/opt/docker/bin/docker-test
+$ exists target/docker/stage/Dockerfile
+$ exists target/docker/stage/opt/docker/bin/docker-test
 > check-dockerfile
 $ exec bash -c 'docker run docker-package:0.1.0 | grep -q "Hello world"'

src/sbt-test/docker/test-packageName/test

@@ -1,6 +1,6 @@
 # Generate the Docker image locally
 > docker:publishLocal
-$ exists target/docker/Dockerfile
-$ exists target/docker/files/opt/docker/bin/docker-test
+$ exists target/docker/stage/Dockerfile
+$ exists target/docker/stage/opt/docker/bin/docker-test
 > check-dockerfile
 $ exec bash -c 'docker run docker-package:0.1.0 | grep -q "Hello world"'

test-project-docker/build.sbt

@@ -0,0 +1,7 @@
+enablePlugins(JavaAppPackaging)
+
+name := "docker-test"
+
+version := "0.1.0"
+
+maintainer := "Gary Coady <gary@lyranthe.org>"

test-project-docker/project/build.properties

@@ -0,0 +1 @@
+sbt.version=0.13.7

test-project-docker/project/plugins.sbt

@@ -0,0 +1,3 @@
+lazy val root = Project("plugins", file(".")).dependsOn(plugin)
+
+lazy val plugin = file("../").getCanonicalFile.toURI

test-project-docker/src/main/scala/Main.scala

@@ -0,0 +1,3 @@
+object Main extends App {
+  println("Hello world")
+}