Merge pull request #293 from rfranco/fix-docker-commands

fix order of docker commands
sbt · Jul 14, 2014 · e75f1d6 · e75f1d6 · benmccann · Jul 19, 2014
2 parents 209ab38 + 2c07381
commit e75f1d6
Showing 1 changed file with 6 additions and 3 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
@@ -9,9 +9,12 @@ trait DockerPlugin extends Plugin with UniversalPlugin {
   val Docker = config("docker") extend Universal
 
   private[this] final def makeDockerContent(dockerBaseImage: String, dockerBaseDirectory: String, maintainer: String, daemonUser: String, name: String, exposedPorts: Seq[Int], exposedVolumes: Seq[String]) = {
-    val dockerCommands = Seq(
+    val headerCommands = Seq(
       Cmd("FROM", dockerBaseImage),
-      Cmd("MAINTAINER", maintainer),
+      Cmd("MAINTAINER", maintainer)
+    )
+
+    val dockerCommands = Seq(
       Cmd("ADD", "files /"),
       Cmd("WORKDIR", "%s" format dockerBaseDirectory),
       ExecCmd("RUN", "chown", "-R", daemonUser, "."),
@@ -42,7 +45,7 @@ trait DockerPlugin extends Plugin with UniversalPlugin {
         )
     }
 
-    Dockerfile(volumeCommands ++ exposeCommand ++ dockerCommands: _*).makeContent
+    Dockerfile(headerCommands ++ volumeCommands ++ exposeCommand ++ dockerCommands: _*).makeContent
   }
 
   private[this] final def generateDockerConfig(