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

Assemble takes into account build.docker=false property #46688

Closed
wants to merge 1 commit into from
+4 −2
Closed

Assemble takes into account build.docker=false property #46688

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
6 changes: 4 additions & 2 deletions distribution/docker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,10 @@ for (final boolean oss : [false, true]) {
addBuildDockerImage(oss)
}

assemble.dependsOn "buildOssDockerImage"
assemble.dependsOn "buildDockerImage"
if (System.getProperty("build.docker") != "false") {
Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for looking at this!

We don't want to bring this behavior back, we would want to remove the property form use and documentation.

The reason is that since our distribution now includes a docker image, one can't assemble without it
as assemble is expected to produce all distributions.

assemble.dependsOn "buildOssDockerImage"
assemble.dependsOn "buildDockerImage"
}

// We build the images used in compose locally, but the pull command insists on using a repository
// thus we must disable it to prevent it from doing so.
Expand Down