dockerfile based binary building #2993

tonistiigi · 2021-03-03T16:10:39Z

Using cross-compilation toolchains that work from any platform
Adds darwin/arm64 support and bake targets. Static and dynamic
binary targets are available, both with glibc and musl.

Build static binary for the current architecture.

VERSION=20.10.6 docker buildx bake

Equivalent:

docker buildx build --platform=local --output ./build

Out of tree:

docker buildx bake "git://github.com/tonistiigi/docker-cli#xx-build"

docker buildx bake "git://github.com/tonistiigi/docker-cli#xx-build" binary

Any other platform

docker buildx bake --set binary.platform=darwin/arm64

docker buildx build --platform=darwin/arm64 --output ./build

Build dynamic binaries

docker buildx bake dynbinary
USE_GLIBC=1 docker buildx bake dynbinary # debian based build

All supported platforms

docker buildx bake cross
docker buildx bake dynbinary-cross

Here is the output: https://gist.github.com/tonistiigi/7f16d059ae97d790bdde314f23f2c94d

Toolchain build from tonistiigi/xx#14 (some early docs: https://gist.github.com/tonistiigi/ebcac239dd3baef6747fc54f3f73cbba)

TODO:

Windows resources with windres not currently added
Update the callers
Remove more old targets
Examples

Signed-off-by: Tonis Tiigi tonistiigi@gmail.com

thaJeztah · 2021-03-11T15:18:17Z

I guess this means we can remove (a couple of) the dockerfiles in https://github.com/docker/cli/tree/master/dockerfiles, correct?

tonistiigi · 2021-03-12T07:30:48Z

@thaJeztah Yes, mentioned in 61ae3bb . Only did the parts that were not optional to the binary building.

thaJeztah

(apparently I had some review comments, in draft but not submitted; let me post them 😂)

thaJeztah · 2021-03-11T15:28:42Z

.circleci/config.yml

- /work/build
+ - run: apk add make curl
+ - run: mkdir -vp ~/.docker/cli-plugins/
+ - run: curl --silent -L --output ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64


Suggested change

- run: curl --silent -L --output ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64

- run: curl -fsSL --output ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64

Perhaps we could use a BUILDX_VERSION env-var for easier grepping and updating?

Suggested change

- run: curl --silent -L --output ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64

- run: curl -fsSL --output ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/"${BUILDX_VERSION}"/buildx-"${BUILDX_VERSION}".linux-amd64

Using cross compilation toolchains that work from any platform Adds darwin/arm64 support and bake targets. Static and dynamic binary targets are available, both with glibc and musl. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

New solution is not hardcoded to amd64 but integrates with the cross toolchain and support creating arm binaries. Go has been updated so that ASLR works Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

More can be removed/refactored but avoiding a huge change. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

codecov-io · 2021-04-06T07:21:49Z

Codecov Report

Merging #2993 (c60419f) into master (59fd6f0) will decrease coverage by 0.01%.
The diff coverage is n/a.

❗ Current head c60419f differs from pull request most recent head 26b633d. Consider uploading reports for the commit 26b633d to get more accurate results

@@            Coverage Diff             @@
##           master    #2993      +/-   ##
==========================================
- Coverage   57.08%   57.06%   -0.02%     
==========================================
  Files         299      299              
  Lines       18689    18683       -6     
==========================================
- Hits        10668    10662       -6     
  Misses       7155     7155              
  Partials      866      866

tiborvass · 2021-04-06T16:33:49Z

scripts/build/binary

@@ -1,14 +1,80 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 #
 # Build a static binary for the host OS/ARCH


remove comment

tiborvass

We can revert some of the Makefile changes for 20.10 branch to make less big changes there.

In docker/cli#2993, Makefile target dynbinary changed from a host script not depending on docker to a dockerized script. Instead call the underlying script directly for deb/rpm. I still think we should build deb/rpms using docker.

In docker/cli#2993, Makefile target dynbinary changed from a host script not depending on docker to a dockerized script. Instead call the underlying script directly for deb/rpm. I still think we should build deb/rpms using docker. Signed-off-by: Tibor Vass <tibor@docker.com>

thaJeztah

lgtm

In docker/cli#2993, Makefile target dynbinary changed from a host script not depending on docker to a dockerized script. Instead call the underlying script directly for deb/rpm. I still think we should build deb/rpms using docker. Signed-off-by: Tibor Vass <tibor@docker.com>

tianon · 2021-04-08T21:02:12Z

scripts/build/.variables

 PLATFORM=${PLATFORM:-}
-VERSION=${VERSION:-"unknown-version"}
+VERSION=${VERSION:-$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags | sed 's/^v//' 2>/dev/null || echo "unknown-version" )}


I think the 2>/dev/null was intended to be on git describe here, not sed, ala:

Suggested change

VERSION=${VERSION:-$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags | sed 's/^v//' 2>/dev/null || echo "unknown-version" )}

VERSION=${VERSION:-$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags 2>/dev/null | sed 's/^v//' || echo "unknown-version" )}

Otherwise we get (the otherwise harmless) fatal: not a git repository (or any of the parent directories): .git output on non-Git builds.

(I found this PR because I've got a job that's building CLI in a container, and it broke today with make: docker: Command not found so I got to go digging to figure out why, and found I now have to use ./scripts/build/binary directly with the variables that are defined in that file but documented in the Dockerfile -- I'm sure this is going to affect others who try to build the CLI in restricted environments too.)

Ah, and worse, the || only takes effect if the sed fails, so I'd suggest something like this instead:

Suggested change

VERSION=${VERSION:-$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags | sed 's/^v//' 2>/dev/null || echo "unknown-version" )}

VERSION=${VERSION:-$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags 2>/dev/null || echo "unknown-version" | sed 's/^v//' )}

Account for changes in docker/cli#2993

docker/cli builds changed with docker/cli#2993 Also minor fix to not clone by branch in order to make sure CLI_REPO works. Will follow-up to do the same for the other projects. Signed-off-by: Brian Goff <cpuguy83@gmail.com>

In docker/cli#2993, Makefile target dynbinary changed from a host script not depending on docker to a dockerized script. Instead call the underlying script directly for deb/rpm. I still think we should build deb/rpms using docker. Signed-off-by: Tibor Vass <tibor@docker.com>

In docker/cli#2993, Makefile target dynbinary changed from a host script not depending on docker to a dockerized script. Instead call the underlying script directly for deb/rpm. I still think we should build deb/rpms using docker. Signed-off-by: Tibor Vass <tibor@docker.com> Upstream-commit: 5d52107 Component: packaging

This preemptively works around the changes in docker/cli#2993.

In docker/cli#2993, Makefile target dynbinary changed from a host script not depending on docker to a dockerized script. Instead call the underlying script directly for deb/rpm. I still think we should build deb/rpms using docker. Signed-off-by: Tibor Vass <tibor@docker.com>

This preemptively works around the changes in docker/cli#2993.

tonistiigi force-pushed the xx-build branch from bb624b3 to 762a7fb Compare March 3, 2021 16:15

This was referenced Mar 4, 2021

vendor: update x/sys to 134d130e #2996

Merged

vendor: update notary to 5f1f4a34 #2997

Merged

tonistiigi force-pushed the xx-build branch 9 times, most recently from e4ab75b to c60419f Compare March 5, 2021 22:37

tonistiigi marked this pull request as ready for review March 5, 2021 22:40

thaJeztah reviewed Mar 27, 2021

View reviewed changes

tiborvass mentioned this pull request Apr 5, 2021

mac: build arm64 binaries docker/docker-ce-packaging#540

Merged

tonistiigi added 7 commits April 6, 2021 00:20

dockerfile based binary building

6423da8

Using cross compilation toolchains that work from any platform Adds darwin/arm64 support and bake targets. Static and dynamic binary targets are available, both with glibc and musl. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

update windows resources generation

8b822c9

New solution is not hardcoded to amd64 but integrates with the cross toolchain and support creating arm binaries. Go has been updated so that ASLR works Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

add windows/arm64 target

a2a1de5

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

update circleci cross target

bd3e853

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

remove unused targets

706e857

More can be removed/refactored but avoiding a huge change. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

update readme with new examples

b099c9c

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

set default version from git

26b633d

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>

tonistiigi force-pushed the xx-build branch from c60419f to 26b633d Compare April 6, 2021 07:21

tiborvass reviewed Apr 6, 2021

View reviewed changes

tiborvass approved these changes Apr 6, 2021

View reviewed changes

tiborvass mentioned this pull request Apr 6, 2021

[20.10 backport] dockerfile based binary building #3042

Merged

thaJeztah approved these changes Apr 6, 2021

View reviewed changes

thaJeztah merged commit a32cd16 into docker:master Apr 7, 2021

tianon reviewed Apr 8, 2021

View reviewed changes

tianon added a commit to tianon/dockerfiles that referenced this pull request Apr 8, 2021

Update CLI build

5e71557

Account for changes in docker/cli#2993

thaJeztah added this to the 21.xx milestone Apr 30, 2021

thaJeztah mentioned this pull request Jul 26, 2021

GitHub Actions for lint #3211

Merged

tianon added a commit to tianon/debian-moby that referenced this pull request Sep 22, 2021

Invoke scripts/build/binary ~directly

a19d0f1

This preemptively works around the changes in docker/cli#2993.

tianon added a commit to tianon/debian-moby that referenced this pull request Oct 15, 2021

Invoke scripts/build/binary ~directly

2915cc2

This preemptively works around the changes in docker/cli#2993.

thaJeztah mentioned this pull request Nov 15, 2021

GitHub Actions e2e tests #3320

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

dockerfile based binary building #2993

dockerfile based binary building #2993

tonistiigi commented Mar 3, 2021 •

edited

Loading

thaJeztah commented Mar 11, 2021

tonistiigi commented Mar 12, 2021

thaJeztah left a comment

thaJeztah Mar 11, 2021

codecov-io commented Apr 6, 2021

tiborvass Apr 6, 2021

tiborvass left a comment

thaJeztah left a comment

tianon Apr 8, 2021

tianon Apr 8, 2021

	- run: curl --silent -L --output ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64
	- run: curl -fsSL --output ~/.docker/cli-plugins/docker-buildx https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64

	VERSION=${VERSION:-$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags \| sed 's/^v//' 2>/dev/null \|\| echo "unknown-version" )}
	VERSION=${VERSION:-$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags 2>/dev/null \| sed 's/^v//' \|\| echo "unknown-version" )}

dockerfile based binary building #2993

dockerfile based binary building #2993

Conversation

tonistiigi commented Mar 3, 2021 • edited Loading

Build static binary for the current architecture.

Any other platform

Build dynamic binaries

All supported platforms

thaJeztah commented Mar 11, 2021

tonistiigi commented Mar 12, 2021

thaJeztah left a comment

Choose a reason for hiding this comment

thaJeztah Mar 11, 2021

Choose a reason for hiding this comment

codecov-io commented Apr 6, 2021

Codecov Report

tiborvass Apr 6, 2021

Choose a reason for hiding this comment

tiborvass left a comment

Choose a reason for hiding this comment

thaJeztah left a comment

Choose a reason for hiding this comment

tianon Apr 8, 2021

Choose a reason for hiding this comment

tianon Apr 8, 2021

Choose a reason for hiding this comment

tonistiigi commented Mar 3, 2021 •

edited

Loading