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

Remove redundant Dockerfile #1062

Merged
merged 3 commits into from
Nov 5, 2017
Merged

Remove redundant Dockerfile #1062

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7ca138
Remove redundant Dockerfile
mrfyda Nov 4, 2017
8a7b9a1
Update tests
mrfyda Nov 5, 2017
1e72b69
Change stage task to use dependsOn
mrfyda Nov 5, 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
11 changes: 5 additions & 6 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 @@ -112,10 +112,6 @@ object DockerPlugin extends AutoPlugin {
Seq(
executableScriptName := executableScriptName.value,
mappings ++= dockerPackageMappings.value,
mappings ++= {
val baseDir = target.value
Seq(dockerGenerateConfig.value) pair (file => IO.relativize(baseDir, file))
},
name := name.value,
packageName := packageName.value,
publishLocal := {
Expand Down Expand Up @@ -144,14 +140,17 @@ object DockerPlugin extends AutoPlugin {
}
},
sourceDirectory := sourceDirectory.value / "docker",
stage := Stager.stage(Docker.name)(streams.value, stagingDirectory.value, mappings.value),
stage := {
dockerGenerateConfig.value
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would rather declare this dependency with

stage := (stage dependsOn dockerGenerateConfig).value

I'm not sure if you have to scope the right hand side stage with in Docker or not. The inConfig semantics always confuse me.

Stager.stage(Docker.name)(streams.value, stagingDirectory.value, mappings.value)
},
stagingDirectory := (target in Docker).value / "stage",
target := target.value / "docker",
daemonUser := "daemon",
daemonGroup := daemonUser.value,
defaultLinuxInstallLocation := "/opt/docker",
dockerPackageMappings := MappingsHelper.contentOf(sourceDirectory.value),
dockerGenerateConfig := generateDockerConfig(dockerCommands.value, target.value)
dockerGenerateConfig := generateDockerConfig(dockerCommands.value, stagingDirectory.value)
)
)

Expand Down