Skip to content

ci: restore builder.Makefile for docker-ce-packaging#9771

Closed
milas wants to merge 1 commit intodocker:v2from
milas:fix-docker-ce-packaging
Closed

ci: restore builder.Makefile for docker-ce-packaging#9771
milas wants to merge 1 commit intodocker:v2from
milas:fix-docker-ce-packaging

Conversation

@milas
Copy link
Contributor

@milas milas commented Aug 19, 2022

What I did
Compose gets rebuilt for docker-ce-packaging as part of DEB &
RPM builds. These cannot use Docker within the build, so need a
native go build command.

We want to keep this here so that we have control of the build
flags etc independently of packaging.

NOTE: The output path is now bin/build/docker-compose to keep
parity with the rest of the Compose build logic - previously
it was bin/docker-compose (no intermediate build/ dir)

Related issue
docker/docker-ce-packaging#742

(not mandatory) A picture of a cute animal, if possible in relation with what you did
two very similar looking farm cats

@milas milas requested review from a team, crazy-max and thaJeztah August 19, 2022 19:55
@milas milas self-assigned this Aug 19, 2022
Compose gets rebuilt for `docker-ce-packaging` as part of DEB &
RPM builds. These cannot use Docker within the build, so need a
native `go build` command.

We want to keep this here so that we have control of the build
flags etc independently of packaging.

NOTE: The output path is now `bin/build/docker-compose` to keep
      parity with the rest of the Compose build logic - previously
      it was `bin/docker-compose` (no intermediate `build/` dir)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
@milas milas force-pushed the fix-docker-ce-packaging branch from 08d1432 to 1101cfb Compare August 19, 2022 19:56
@nicksieger
Copy link
Member

Checked out and ran make -f builder.Makefile and all is well ✅

thaJeztah added a commit to thaJeztah/docker-ce-packaging that referenced this pull request Aug 19, 2022
testing docker/compose#9771

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/docker-ce-packaging that referenced this pull request Aug 19, 2022
testing docker/compose#9771

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 061b173)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member

We merged docker/docker-ce-packaging#744, which fixes the issue in packaging; I guess we can decide to keep that, or to switch back to using the builder.Makefile from #9771.

Overall, the build for the compose plugin is fairly trivial, but of course the -ldflags is usually where the fun is (so there's still a small risk of diverging)

@nicksieger
Copy link
Member

#9776 should obsolete this

@milas milas closed this Aug 24, 2022
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.

3 participants