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.

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

Conversation

mrfyda
Copy link
Contributor

@mrfyda mrfyda commented Nov 4, 2017

Fixes #1060

Copy link
Contributor

@muuki88 muuki88 left a comment

Choose a reason for hiding this comment

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

Thanks for fixing this. There are a lot of checks in the scripted tests that rely on the duplicated docker file. Fixing this should be straightforward: point to the one and only dockerfile

@@ -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.

Copy link
Contributor

@muuki88 muuki88 left a comment

Choose a reason for hiding this comment

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

Awesome 🤩 thanks for fixing this.

@muuki88 muuki88 merged commit 1cc81a0 into sbt:master Nov 5, 2017
@mrfyda mrfyda deleted the remove-redundant-dockerfile branch November 5, 2017 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants