Docker registry credentials

build.sbt

@@ -11,6 +11,9 @@ libraryDependencies ++= Seq(
 
 scalacOptions := Seq("-deprecation", "-unchecked", "-feature")
 
+crossScalaVersions := Seq("2.10.6", "2.12.2")
+crossSbtVersions := Seq("0.13.16", "1.0.0")
+
 licenses := Seq("MIT License" -> url("https://github.com/marcuslonnberg/sbt-docker/blob/master/LICENSE"))
 homepage := Some(url("https://github.com/marcuslonnberg/sbt-docker"))
 scmInfo := Some(ScmInfo(url("https://github.com/marcuslonnberg/sbt-docker"), "scm:git:git://github.com:marcuslonnberg/sbt-docker.git"))

src/main/scala/sbtdocker/DockerKeys.scala

@@ -14,4 +14,6 @@ object DockerKeys {
   val imageNames = taskKey[Seq[ImageName]]("Names of the built image.")
   val dockerPath = settingKey[String]("Path to the Docker binary.")
   val buildOptions = settingKey[BuildOptions]("Options for the Docker build command.")
+
+  val dockerRegistryCredentials = settingKey[Option[DockerRegistryCredentials]]("Credentials to Docker Registry")
 }

src/main/scala/sbtdocker/DockerPush.scala

@@ -5,16 +5,23 @@ import sbt._
 import scala.sys.process.{Process, ProcessLogger}
 
 object DockerPush {
+
+  val processLog: Logger => ProcessLogger = log => ProcessLogger({ line =>
+    log.info(line)
+  }, { line =>
+    log.info(line)
+  })
+
   /**
    * Push Docker images to a registry.
    *
    * @param dockerPath path to the docker binary
    * @param imageNames names of the images to push
    * @param log logger
    */
-  def apply(dockerPath: String, imageNames: Seq[ImageName], log: Logger): Unit = {
+  def apply(dockerPath: String, imageNames: Seq[ImageName], log: Logger, dockerRegistryCredentials: Option[DockerRegistryCredentials] = None): Unit = {
     imageNames.foreach { imageName =>
-      apply(dockerPath, imageName, log)
+      apply(dockerPath, imageName, log, dockerRegistryCredentials)
     }
   }
 
@@ -25,20 +32,34 @@ object DockerPush {
    * @param imageName name of the image to push
    * @param log logger
    */
-  def apply(dockerPath: String, imageName: ImageName, log: Logger): Unit = {
+  def apply(dockerPath: String, imageName: ImageName, log: Logger, dockerRegistryCredentials: Option[DockerRegistryCredentials]): Unit = {
     log.info(s"Pushing docker image with name: '$imageName'")
+    dockerRegistryCredentials.map(login).foreach(_(dockerPath, log))
+    val command = dockerPath :: "push" :: imageName.toString :: Nil
+    runCommand(command)("Failed to push", log)
+    dockerRegistryCredentials.map(logout).foreach(_(dockerPath, log))
+  }
 
-    val processLog = ProcessLogger({ line =>
-      log.info(line)
-    }, { line =>
-      log.info(line)
-    })
+  private def login(dockerRegistryCredentials: DockerRegistryCredentials): (String, Logger) => Unit = (dockerPath, log) => {
+    log.info(s"Login to docker registry")
+    val command = dockerPath :: "login" ::
+      "-u" :: dockerRegistryCredentials.username ::
+      "-p" :: dockerRegistryCredentials.password ::
+      dockerRegistryCredentials.url :: Nil
+    runCommand(command)("Failed to login", log)
+  }
 
-    val command = dockerPath :: "push" :: imageName.toString :: Nil
-    log.debug(s"Running command: '${command.mkString(" ")}'")
+  private def logout(dockerRegistryCredentials: DockerRegistryCredentials): (String, Logger) => Unit = (dockerPath, log) => {
+    log.info(s"Logout from docker registry")
+    val command = dockerPath :: "logout" ::
+      dockerRegistryCredentials.url :: Nil
+    runCommand(command)("Failed to logout", log)
+  }
 
+  private def runCommand(command: Seq[String]): (String, Logger) => Unit = (errorMsg, log) => {
+    log.debug(s"Running command: '${command.mkString(" ")}'")
     val process = Process(command)
-    val exitValue = process ! processLog
-    if (exitValue != 0) sys.error("Failed to push")
+    val exitValue = process ! processLog(log)
+    if (exitValue != 0) sys.error(errorMsg)
   }
 }

src/main/scala/sbtdocker/DockerSettings.scala

@@ -20,8 +20,8 @@ object DockerSettings {
       val log = Keys.streams.value.log
       val dockerPath = (DockerKeys.dockerPath in docker).value
       val imageNames = (DockerKeys.imageNames in docker).value
-
-      DockerPush(dockerPath, imageNames, log)
+      val dockerRegistryCredentials = (DockerKeys.dockerRegistryCredentials in docker).value
+      DockerPush(dockerPath, imageNames, log, dockerRegistryCredentials)
     },
     dockerBuildAndPush := Def.taskDyn {
       val id = docker.value
@@ -51,7 +51,8 @@ object DockerSettings {
       Seq((imageName in docker).value)
     },
     dockerPath in docker := sys.env.get("DOCKER").filter(_.nonEmpty).getOrElse("docker"),
-    buildOptions in docker := BuildOptions()
+    buildOptions in docker := BuildOptions(),
+    dockerRegistryCredentials in docker := None
   )
 
   def autoPackageJavaApplicationSettings(

src/main/scala/sbtdocker/models.scala

@@ -104,3 +104,5 @@ case class ImageName(
   @deprecated("Use toString instead.", "0.4.0")
   def name = toString
 }
+
+case class DockerRegistryCredentials(url: String, username: String, password: String)