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

Allow name in Docker to be modified. #279

Merged
merged 1 commit into from
Jun 23, 2014
Merged

Allow name in Docker to be modified. #279

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions 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 @@ -56,6 +56,7 @@ trait DockerPlugin extends Plugin with UniversalPlugin {

def dockerSettings: Seq[Setting[_]] = Seq(
dockerBaseImage := "dockerfile/java",
name in Docker <<= name,
sourceDirectory in Docker <<= sourceDirectory apply (_ / "docker"),
target in Docker <<= target apply (_ / "docker")
) ++ mapGenericFilesToDocker ++ inConfig(Docker)(Seq(
Expand All @@ -67,6 +68,7 @@ trait DockerPlugin extends Plugin with UniversalPlugin {
MappingsHelper contentOf dir
},
mappings <++= dockerPackageMappings,
normalizedName <<= name apply Project.normalizeModuleID,
stage <<= (dockerGenerateConfig, dockerGenerateContext) map { (configFile, contextDir) => () },
dockerGenerateContext <<= (cacheDirectory, mappings, target) map {
(cacheDirectory, mappings, t) =>
Expand Down
1 change: 1 addition & 0 deletions src/main/scala/com/typesafe/sbt/packager/docker/Keys.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ trait DockerKeys {
object Keys extends DockerKeys {
def cacheDirectory = sbt.Keys.cacheDirectory
def mappings = sbt.Keys.mappings
def name = sbt.Keys.name
def publishArtifact = sbt.Keys.publishArtifact
def sourceDirectory = sbt.Keys.sourceDirectory
def target = sbt.Keys.target
Expand Down