Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for docker:publish in DockerSpotifyClientPlugin #1338

Merged
merged 1 commit into from
May 11, 2020
Merged

Add support for docker:publish in DockerSpotifyClientPlugin #1338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 29 additions & 7 deletions src/main/scala/com/typesafe/sbt/packager/docker/DockerSpotifyClientPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ object DockerSpotifyClientPlugin extends AutoPlugin {
def clientSettings =
Seq(
publishLocal := publishLocalDocker.value,
publish := publishDocker.value,
dockerVersion := dockerServerVersion.value,
dockerApiVersion := dockerServerApiVersion.value
)
Expand All @@ -71,6 +72,15 @@ object DockerSpotifyClientPlugin extends AutoPlugin {
docker.packageDocker(primaryAlias, aliases, dockerDirectory, log)
}

def publishDocker: Def.Initialize[Task[Unit]] = Def.task {
val _ = publishLocal.value
val aliases = dockerAliases.value
val log = streams.value.log

val docker = new DockerClientTask()
docker.publishDocker(aliases, log)
}

def dockerServerVersion: Def.Initialize[Task[Option[DockerVersion]]] = Def.task {
val docker = new DockerClientTask()
docker.dockerServerVersion()
Expand Down Expand Up @@ -104,19 +114,23 @@ private class DockerClientTask {

log.info(s"PublishLocal using Docker API ${docker.version().apiVersion()}")

docker.build(Paths.get(dockerDirectory), primaryAlias.toString, new ProgressHandler {
override def progress(message: ProgressMessage): Unit =
Option(message.error()) match {
case Some(error) if error.nonEmpty => log.error(message.error())
case _ => Option(message.stream()) foreach (v => log.info(v))
}
}, BuildParam.forceRm())
docker.build(Paths.get(dockerDirectory), primaryAlias.toString, progressHandler(log), BuildParam.forceRm())

aliases.foreach { tag =>
docker.tag(primaryAlias.toString, tag.toString, true)
}
}

def publishDocker(aliases: Seq[DockerAlias], log: Logger): Unit = {
val docker: DockerClient = DefaultDockerClient.fromEnv().build()

log.info(s"Publish using Docker API ${docker.version().apiVersion()}")

aliases.foreach { tag =>
docker.push(tag.toString, progressHandler(log))
}
}

def dockerServerVersion(): Option[DockerVersion] = {
val docker: DockerClient = DefaultDockerClient.fromEnv().build()
DockerVersion.parse(docker.version().version())
Expand All @@ -126,4 +140,12 @@ private class DockerClientTask {
val docker: DockerClient = DefaultDockerClient.fromEnv().build()
DockerApiVersion.parse(docker.version().apiVersion())
}

private def progressHandler(log: Logger) = new ProgressHandler {
override def progress(message: ProgressMessage): Unit =
Option(message.error()) match {
case Some(error) if error.nonEmpty => log.error(message.error())
case _ => Option(message.stream()) foreach (v => log.info(v))
}
}
}