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

Issue 972 pretty print docker alias #987

Merged
merged 2 commits into from
May 26, 2017
Merged

Issue 972 pretty print docker alias #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b27ec2
Cleanup imports
muuki88 May 25, 2017
964d695
FIX #972 use versioned string as log output
muuki88 May 25, 2017
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
12 changes: 5 additions & 7 deletions src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package com.typesafe.sbt
package packager
package debian
package com.typesafe.sbt.packager.debian

import com.typesafe.sbt.packager.archetypes.TemplateWriter
import com.typesafe.sbt.packager.universal.Archives
import sbt._
import sbt.Keys.{mappings, normalizedName, packageBin, streams, target, version}
import linux.{LinuxFileMetaData, LinuxPackageMapping, LinuxSymlink}
import linux.LinuxPlugin.autoImport.{
import sbt.Keys.{normalizedName, packageBin, streams, target, version}
import com.typesafe.sbt.packager.linux.{LinuxFileMetaData, LinuxPackageMapping, LinuxSymlink}
import com.typesafe.sbt.packager.linux.LinuxPlugin.autoImport.{
linuxPackageMappings,
linuxPackageSymlinks,
linuxScriptReplacements,
Expand All @@ -17,7 +15,7 @@ import scala.collection.JavaConversions._
import org.vafer.jdeb.{DataProducer, DebMaker}
import org.vafer.jdeb.mapping._
import org.vafer.jdeb.producers._
import DebianPlugin.{Names}
import DebianPlugin.Names
import DebianPlugin.autoImport._

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/typesafe/sbt/packager/docker/DockerPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ object DockerPlugin extends AutoPlugin {
publishLocal := {
val log = streams.value.log
publishLocalDocker(stage.value, dockerBuildCommand.value, log)
log.info(s"Built image ${dockerAlias.value}")
log.info(s"Built image ${dockerAlias.value.versioned}")
},
publish := {
val _ = publishLocal.value
Expand Down