ci: Add bin-image workflow by vvoland · Pull Request #4752 · docker/cli

vvoland · 2024-01-04T13:40:17Z

- What I did
Build and push an image containing a static CLI binary for master branch and every release branch and tag.

This is a slightly adjusted copy of the bin-image workflow from moby/moby (by @crazy-max).

- How I did it
See individual commits.

- How to verify it
Tested against my fork:

`v29.0.0` tag: https://github.com/vvoland/cli/actions/runs/7410112486/job/20161818586

$ printf 'FROM alpine
   COPY --from=pawelgronowski465/cli-bin:29.0.0 /docker /docker
   RUN /docker version' | docker build -
...
0.119 Client:
0.119  Version:           29.0.0
0.119  API version:       1.44
0.119  Go version:        go1.21.5
0.119  Git commit:        d1b8d3ce50
0.119  Built:             Thu Jan  4 13:26:07 2024
0.119  OS/Arch:           linux/arm64
0.119  Context:           default

`29.0` branch: https://github.com/vvoland/cli/actions/runs/7409929402/job/20161236975

$ printf 'FROM alpine
   COPY --from=pawelgronowski465/cli-bin:29.0 /docker /docker
   RUN /docker version' | docker build -
...
0.162 Client:
0.162  Version:           29.0
0.162  API version:       1.44
0.162  Go version:        go1.21.5
0.162  Git commit:        a1f9f0d681
0.162  Built:             Thu Jan  4 13:10:11 2024
0.162  OS/Arch:           linux/arm64
0.162  Context:           default
...

`ci-bin-image-test` branch: https://github.com/vvoland/cli/actions/runs/7410075016/job/20161631291

$ rintf 'FROM alpine
   COPY --from=pawelgronowski465/cli-bin:ci-bin-image-test /docker /docker
   RUN /docker version' | docker build -
...
0.153 Client:
0.153  Version:           ci-bin-image-test
0.153  API version:       1.44
0.153  Go version:        go1.21.5
0.153  Git commit:        d1b8d3ce50
0.153  Built:             Thu Jan  4 13:22:07 2024
0.153  OS/Arch:           linux/arm64
0.153  Context:           default
...

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

.github/workflows/bin-image.yml

codecov-commenter · 2024-01-05T12:31:33Z

Codecov Report

Merging #4752 (3d16840) into master (859154b) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #4752   +/-   ##
=======================================
  Coverage   59.61%   59.61%           
=======================================
  Files         287      287           
  Lines       24784    24784           
=======================================
  Hits        14775    14775           
  Misses       9121     9121           
  Partials      888      888

.github/workflows/build.yml

crazy-max · 2024-01-05T12:54:56Z

.github/workflows/build.yml

+            type=ref,event=pr
+            type=sha
+      -
+        name: Login to DockerHub


Needs to skip login on PR:

Suggested change

name: Login to DockerHub

name: Login to DockerHub

if: github.event_name != 'pull_request'

Yes it will be removed once the PR is undrafted, this is all a part of a separate debug commit that just enables the worflow to run for this PR: 23c5809

.github/workflows/build.yml

`scripts/make/binary` produces `docker` file that is a symlink to a `docker-<platform>` file. Make the `binary` Dockerfile target produce an image that only contains the `docker` binary and not the symlink. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>

Transform `VERSION` variable if it contains a git ref. This is the same as moby does (with "<<<" bashism removed). Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>

@crazy-max

Build and push an image containing a static CLI binary for master branch and every release branch and tag. This is a slightly adjusted copy of the bin-image workflow from docker/buildx (by @crazy-max). Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com> Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>

thaJeztah · 2024-01-12T12:19:27Z

Dockerfile


 FROM scratch AS binary
-COPY --from=build /out .
+COPY --from=build /out/docker /docker


Curious why this COPY had to be changed; did we add more things in /out ? Where possible, I like “copy all the things” so that the part copying things doesn’t need to know what to look for

(basically "/out" being the "contract" / API (for better words)

scripts/build/binary produces two files, first is docker-<platform>-<arch> which is an actual binary, and the second is a docker which is a symlink to the former.

So without this change the image content would be:

/docker-<platform>-<arch> # the actual binary /docker # symlink to the above

The COPY copies the /docker which dereferences into the actual binary and puts that directly as /docker in the final image. So the image only contains the docker binary directly.

It's not strictly needed, because it should work with COPY --from=dockereng/cli /docker /docker anyway, but I'm not sure if we really need that symlink in the final image.

Alternatively I could look into changing the scripts/build/binary so that it doesn't output the symlink, but that would probably require changing other things.

Ah, yes, forgot about the symlink; yeah. not a blocker, just something "nice if we can improve"

LOL, and of course I didn't think of docker-ce-packaging using this output, and now failng;

dest=$PWD/build/mac; cd /home/ubuntu/workspace/release-packaging_ce-nightly/packaging/src/github.com/docker/cli/build && for platform in *; do \ arch=$(echo $platform | cut -d_ -f2); \ mkdir -p $dest/$arch/docker; \ cp $platform/docker-darwin-* $dest/$arch/docker/docker && \ tar -C $dest/$arch -c -z -f $dest/$arch/docker-25.0.0-rc.2.tgz docker; \ done cp: cannot stat 'darwin_amd64/docker-darwin-*': No such file or directory cp: cannot stat 'darwin_arm64/docker-darwin-*': No such file or directory

vvoland · 2024-01-12T14:26:44Z

FYI, the secrets are filled and the PR is ready for review.

crazy-max

LGTM

thaJeztah

LGTM; let's get this one in and check if it all works 👍

vvoland added kind/enhancement status/2-code-review labels Jan 4, 2024

vvoland self-assigned this Jan 4, 2024

vvoland force-pushed the ci-bin-image branch from 1a476d9 to 0276e9d Compare January 4, 2024 13:45

crazy-max reviewed Jan 5, 2024

View reviewed changes

.github/workflows/bin-image.yml Outdated Show resolved Hide resolved

vvoland force-pushed the ci-bin-image branch from 0276e9d to 41d985e Compare January 5, 2024 12:31

crazy-max reviewed Jan 5, 2024

View reviewed changes

.github/workflows/build.yml Show resolved Hide resolved

vvoland force-pushed the ci-bin-image branch from eab3267 to 23c5809 Compare January 5, 2024 12:46

crazy-max reviewed Jan 5, 2024

View reviewed changes

.github/workflows/build.yml Outdated Show resolved Hide resolved

vvoland added 3 commits January 12, 2024 12:28

scripts/build: Handle VERSION containing git ref

ecf338f

Transform `VERSION` variable if it contains a git ref. This is the same as moby does (with "<<<" bashism removed). Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>

vvoland force-pushed the ci-bin-image branch 2 times, most recently from 3bb23b3 to 3d16840 Compare January 12, 2024 12:07

thaJeztah reviewed Jan 12, 2024

View reviewed changes

vvoland force-pushed the ci-bin-image branch from 3d16840 to 15d4c99 Compare January 12, 2024 12:57

vvoland marked this pull request as ready for review January 12, 2024 14:02

vvoland requested a review from crazy-max January 12, 2024 14:26

crazy-max approved these changes Jan 12, 2024

View reviewed changes

thaJeztah added this to the 25.0.0 milestone Jan 12, 2024

thaJeztah approved these changes Jan 12, 2024

View reviewed changes

thaJeztah merged commit d469be2 into docker:master Jan 12, 2024

thaJeztah mentioned this pull request Jan 12, 2024

temporarily revert ci: Add bin-image workflow #4785

Merged

vvoland mentioned this pull request Jan 15, 2024

ci: Add bin-image workflow (2nd approach) #4791

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ci: Add bin-image workflow #4752

ci: Add bin-image workflow #4752
thaJeztah merged 3 commits intodocker:masterfrom
vvoland:ci-bin-image

vvoland commented Jan 4, 2024 •

edited

Loading

Uh oh!

Uh oh!

codecov-commenter commented Jan 5, 2024 •

edited

Loading

Uh oh!

Uh oh!

crazy-max Jan 5, 2024

Uh oh!

vvoland Jan 5, 2024

Uh oh!

Uh oh!

thaJeztah Jan 12, 2024

Uh oh!

vvoland Jan 12, 2024

Uh oh!

thaJeztah Jan 12, 2024

Uh oh!

thaJeztah Jan 12, 2024

Uh oh!

vvoland commented Jan 12, 2024

Uh oh!

crazy-max left a comment

Uh oh!

thaJeztah left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

	name: Login to DockerHub
	name: Login to DockerHub
	if: github.event_name != 'pull_request'

Conversation

vvoland commented Jan 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

v29.0.0 tag: https://github.com/vvoland/cli/actions/runs/7410112486/job/20161818586

29.0 branch: https://github.com/vvoland/cli/actions/runs/7409929402/job/20161236975

ci-bin-image-test branch: https://github.com/vvoland/cli/actions/runs/7410075016/job/20161631291

Uh oh!

Uh oh!

codecov-commenter commented Jan 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

crazy-max Jan 5, 2024

Choose a reason for hiding this comment

Uh oh!

vvoland Jan 5, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

thaJeztah Jan 12, 2024

Choose a reason for hiding this comment

Uh oh!

vvoland Jan 12, 2024

Choose a reason for hiding this comment

Uh oh!

thaJeztah Jan 12, 2024

Choose a reason for hiding this comment

Uh oh!

thaJeztah Jan 12, 2024

Choose a reason for hiding this comment

Uh oh!

vvoland commented Jan 12, 2024

Uh oh!

crazy-max left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

vvoland commented Jan 4, 2024 •

edited

Loading

`v29.0.0` tag: https://github.com/vvoland/cli/actions/runs/7410112486/job/20161818586

`29.0` branch: https://github.com/vvoland/cli/actions/runs/7409929402/job/20161236975

`ci-bin-image-test` branch: https://github.com/vvoland/cli/actions/runs/7410075016/job/20161631291

codecov-commenter commented Jan 5, 2024 •

edited

Loading