Merge pull request #135 from lwronski/feature/docker-package

Add docker package logging and generate bootstrap file in temp directory for docker

Author: romanowski

modules/build/src/main/scala/scala/build/options/BuildOptions.scala

@@ -217,7 +217,8 @@ final case class BuildOptions(
 
   // FIXME We'll probably need more refined rules if we start to support extra Scala.JS or Scala Native specific types
   def packageTypeOpt: Option[PackageType] =
-    if (scalaJsOptions.enable) Some(PackageType.Js)
+    if (packageOptions.isDockerEnabled) Some(PackageType.Docker)
+    else if (scalaJsOptions.enable) Some(PackageType.Js)
     else if (scalaNativeOptions.enable) Some(PackageType.Native)
     else packageOptions.packageTypeOpt
 

modules/build/src/main/scala/scala/build/options/PackageType.scala

@@ -18,6 +18,7 @@ object PackageType {
   case object Native extends PackageType {
     override def runnable = true
   }
+  case object Docker extends PackageType
   case object Debian extends NativePackagerType
   case object Dmg    extends NativePackagerType
   case object Pkg    extends NativePackagerType

modules/cli/src/main/scala/scala/cli/commands/Package.scala

@@ -185,44 +185,44 @@ object Package extends ScalaCommand[PackageOptions] {
 
         lazy val debianSettings = DebianSettings(
           shared = sharedSettings,
-          maintainer = packageOptions.maintainer.mandatory("maintainer", "debian"),
-          description = packageOptions.description.mandatory("description", "debian"),
+          maintainer = packageOptions.maintainer.mandatory("--maintainer", "debian"),
+          description = packageOptions.description.mandatory("--description", "debian"),
           debianConflicts = packageOptions.debianOptions.conflicts,
           debianDependencies = packageOptions.debianOptions.dependencies,
           architecture = packageOptions.debianOptions.architecture.mandatory(
-            "deb architecture",
+            "--deb-architecture",
             "debian"
           )
         )
 
         lazy val macOSSettings = MacOSSettings(
           shared = sharedSettings,
           identifier =
-            packageOptions.macOSidentifier.mandatory("identifier parameter", "macOs")
+            packageOptions.macOSidentifier.mandatory("--identifier-parameter", "macOs")
         )
 
         lazy val redHatSettings = RedHatSettings(
           shared = sharedSettings,
-          description = packageOptions.description.mandatory("description", "redHat"),
+          description = packageOptions.description.mandatory("--description", "redHat"),
           license =
-            packageOptions.redHatOptions.license.mandatory("license", "redHat"),
+            packageOptions.redHatOptions.license.mandatory("--license", "redHat"),
           release =
-            packageOptions.redHatOptions.release.mandatory("release", "redHat"),
+            packageOptions.redHatOptions.release.mandatory("--release", "redHat"),
           rpmArchitecture = packageOptions.redHatOptions.architecture.mandatory(
-            "rpm architecture",
+            "--rpm-architecture",
             "redHat"
           )
         )
 
         lazy val windowsSettings = WindowsSettings(
           shared = sharedSettings,
-          maintainer = packageOptions.maintainer.mandatory("maintainer", "windows"),
+          maintainer = packageOptions.maintainer.mandatory("--maintainer", "windows"),
           licencePath = packageOptions.windowsOptions.licensePath.mandatory(
-            "licence path",
+            "--licence-path",
             "windows"
           ),
           productName = packageOptions.windowsOptions.productName.mandatory(
-            "product name",
+            "--product-name",
             "windows"
           ),
           exitDialog = packageOptions.windowsOptions.exitDialog,
@@ -249,29 +249,45 @@ object Package extends ScalaCommand[PackageOptions] {
               imageResizerOpt = imageResizerOpt
             ).build()
         }
-    }
+      case PackageType.Docker =>
+        val exec = if (build.options.scalaJsOptions.enable) "node" else "sh"
+        val from = build.options.packageOptions.dockerOptions.from match {
+          case Some(baseImage) => baseImage
+          case None => if (build.options.scalaJsOptions.enable) "node" else "openjdk:8-jre-slim"
+        }
+        val repository = build.options.packageOptions.dockerOptions.imageRepository.mandatory(
+          "--docker-image-repository",
+          "docker"
+        )
+        val tag = build.options.packageOptions.dockerOptions.imageTag.getOrElse("latest")
+
+        val dockerSettings = DockerSettings(
+          from = from,
+          registry = build.options.packageOptions.dockerOptions.imageRegistry,
+          repository = repository,
+          tag = Some(tag),
+          exec = exec
+        )
 
-    // build docker image
-    if (build.options.packageOptions.isDockerEnabled) {
+        val appPath = os.temp.dir(prefix = "scala-cli-docker") / "app"
+        if (build.options.scalaJsOptions.enable) {
+          val linkerConfig = build.options.scalaJsOptions.linkerConfig
+          linkJs(build, appPath, Some(mainClass()), addTestInitializer = false, linkerConfig)
+        }
+        else {
+          bootstrap(build, appPath, mainClass(), () => alreadyExistsCheck())
+        }
 
-      val exec = if (build.options.scalaJsOptions.enable) "node" else "sh"
-      val from = build.options.packageOptions.dockerOptions.from match {
-        case Some(baseImage) => baseImage
-        case None => if (build.options.scalaJsOptions.enable) "node" else "adoptopenjdk/openjdk8"
-      }
+        logger.message(
+          "Started building docker image with your application, it would take some time"
+        )
 
-      val dockerSettings = DockerSettings(
-        from = from,
-        registry = build.options.packageOptions.dockerOptions.imageRegistry,
-        repository = build.options.packageOptions.dockerOptions.imageRepository.mandatory(
-          "image repository",
-          "docker"
-        ),
-        tag = build.options.packageOptions.dockerOptions.imageTag,
-        exec = exec
-      )
+        DockerPackage(appPath, dockerSettings).build()
 
-      DockerPackage(destPath, dockerSettings).build()
+        logger.message(
+          "Built docker image, run it with" + System.lineSeparator() +
+            s"  docker run $repository:$tag"
+        )
     }
 
     logger.message {
@@ -281,6 +297,8 @@ object Package extends ScalaCommand[PackageOptions] {
       else if (packageType == PackageType.Js)
         s"Wrote $dest, run it with" + System.lineSeparator() +
           "  node " + printableDest
+      else if (packageType == PackageType.Docker)
+        "Wrote docker image"
       else
         s"Wrote $dest"
     }

modules/cli/src/main/scala/scala/cli/commands/PackagerOptions.scala

@@ -86,7 +86,7 @@ final case class PackagerOptions(
   @HelpMessage(
     "The image repository"
   )
-  dockerImageRepository: Option[String] = None,
+  dockerImageRepository: Option[String] = Some("latest"),
   @Group("Docker")
   @HelpMessage(
     "The image tag, the default tag is latest"