beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
moby/Dockerfile.buildx

27 lines
960 B
Text
Raw Normal View History

Bump Golang 1.13.15 full diff: https://github.com/golang/go/compare/go1.13.14...go1.13.15 go1.13.15 (released 2020/08/06) includes security fixes to the encoding/binary package. See the Go 1.13.15 milestone on the issue tracker for details. https://github.com/golang/go/issues?q=milestone%3AGo1.13.15+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-10 10:13:38 +00:00
ARG GO_VERSION=1.13.15
make buildx: update to buildx v0.3.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-14 17:02:03 +00:00
ARG BUILDX_COMMIT=v0.3.1
Use buildx as Makefile builder Since the dockerfile now requires buildkit, let's just use buildx can bootstrap itself into even an old version of Docker which does not support buildkit. This also decouples the Dockerfile/build from the version of Docker which is installed. One major downside: If buildx needs to setup a container driver (ie, docker does not support buildkit), the `make shell` target (and others which call `DOCKER_RUN_DOCKER`) must export the image from buildkit and into docker. This added an extra 70s to a full build for me (agan only for targets which call `DOCKER_RUN_DOCKER`) and 40s on a rebuild (with no changes). Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-06-07 17:10:31 +00:00
ARG BUILDX_REPO=https://github.com/docker/buildx.git
make buildx: make version in Dockerfile leading This patch removes the `BUILDX_COMMIT` make variable. With the make variable removed, it no longer "masks" environment variables, and there is no longer a need to export the variable. A side effect of this change, is that (by default), the buildx image is tagged as `moby-buildx:latest`. This likely isn't a problem, because the build-cache would still be preserved in intermediate images. Having the image tagged as `:latest` also makes cleaning up easier (without having to remove the image for each version tagged. Otherwise, the behavior remains the same as before: # default rm -f bundles/buildx && make buildx # => => naming to docker.io/library/moby-buildx:latest github.com/docker/buildx v0.3.0 c967f1d # using a make variable: rm -f bundles/buildx && make BUILDX_COMMIT=v0.2.1 buildx # => => naming to docker.io/library/moby-buildx:v0.2.1 github.com/docker/buildx v0.2.1 0eb2df5 # using an environment variable: rm -f bundles/buildx && BUILDX_COMMIT=v0.2.2 make buildx # => => naming to docker.io/library/moby-buildx:v0.2.2 github.com/docker/buildx v0.2.2 ab5fe3d Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-14 12:51:49 +00:00
Switch all Dockerfiles to use "buster" variant Commit 4e3ab9e9fbca682f75eb350c8ad4312282869a03 switched the main Dockerfile to the "buster" variant, but did not update some of the other Dockerfiles. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-24 12:31:04 +00:00
FROM golang:${GO_VERSION}-buster AS build
make buildx: make version in Dockerfile leading This patch removes the `BUILDX_COMMIT` make variable. With the make variable removed, it no longer "masks" environment variables, and there is no longer a need to export the variable. A side effect of this change, is that (by default), the buildx image is tagged as `moby-buildx:latest`. This likely isn't a problem, because the build-cache would still be preserved in intermediate images. Having the image tagged as `:latest` also makes cleaning up easier (without having to remove the image for each version tagged. Otherwise, the behavior remains the same as before: # default rm -f bundles/buildx && make buildx # => => naming to docker.io/library/moby-buildx:latest github.com/docker/buildx v0.3.0 c967f1d # using a make variable: rm -f bundles/buildx && make BUILDX_COMMIT=v0.2.1 buildx # => => naming to docker.io/library/moby-buildx:v0.2.1 github.com/docker/buildx v0.2.1 0eb2df5 # using an environment variable: rm -f bundles/buildx && BUILDX_COMMIT=v0.2.2 make buildx # => => naming to docker.io/library/moby-buildx:v0.2.2 github.com/docker/buildx v0.2.2 ab5fe3d Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-14 12:51:49 +00:00
ARG BUILDX_REPO
Use buildx as Makefile builder Since the dockerfile now requires buildkit, let's just use buildx can bootstrap itself into even an old version of Docker which does not support buildkit. This also decouples the Dockerfile/build from the version of Docker which is installed. One major downside: If buildx needs to setup a container driver (ie, docker does not support buildkit), the `make shell` target (and others which call `DOCKER_RUN_DOCKER`) must export the image from buildkit and into docker. This added an extra 70s to a full build for me (agan only for targets which call `DOCKER_RUN_DOCKER`) and 40s on a rebuild (with no changes). Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-06-07 17:10:31 +00:00
RUN git clone "${BUILDX_REPO}" /buildx
WORKDIR /buildx
make buildx: make version in Dockerfile leading This patch removes the `BUILDX_COMMIT` make variable. With the make variable removed, it no longer "masks" environment variables, and there is no longer a need to export the variable. A side effect of this change, is that (by default), the buildx image is tagged as `moby-buildx:latest`. This likely isn't a problem, because the build-cache would still be preserved in intermediate images. Having the image tagged as `:latest` also makes cleaning up easier (without having to remove the image for each version tagged. Otherwise, the behavior remains the same as before: # default rm -f bundles/buildx && make buildx # => => naming to docker.io/library/moby-buildx:latest github.com/docker/buildx v0.3.0 c967f1d # using a make variable: rm -f bundles/buildx && make BUILDX_COMMIT=v0.2.1 buildx # => => naming to docker.io/library/moby-buildx:v0.2.1 github.com/docker/buildx v0.2.1 0eb2df5 # using an environment variable: rm -f bundles/buildx && BUILDX_COMMIT=v0.2.2 make buildx # => => naming to docker.io/library/moby-buildx:v0.2.2 github.com/docker/buildx v0.2.2 ab5fe3d Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-14 12:51:49 +00:00
ARG BUILDX_COMMIT
Use buildx as Makefile builder Since the dockerfile now requires buildkit, let's just use buildx can bootstrap itself into even an old version of Docker which does not support buildkit. This also decouples the Dockerfile/build from the version of Docker which is installed. One major downside: If buildx needs to setup a container driver (ie, docker does not support buildkit), the `make shell` target (and others which call `DOCKER_RUN_DOCKER`) must export the image from buildkit and into docker. This added an extra 70s to a full build for me (agan only for targets which call `DOCKER_RUN_DOCKER`) and 40s on a rebuild (with no changes). Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-06-07 17:10:31 +00:00
RUN git fetch origin "${BUILDX_COMMIT}":build && git checkout build
ARG GOOS
ARG GOARCH
# Keep these essentially no-op var settings for debug purposes.
# It allows us to see what the GOOS/GOARCH that's being built for is.
make buildx: fix variable substitution and version The variables were not substituted, because single-quotes were used. While at it; change the fixed version/commit to use the actual commit and version, using git. before this change: make buildx && ./bundles/buildx version github.com/docker/buildx ${BUILDX_COMMIT} ${BUILDX_COMMIT} after this change: make buildx && ./bundles/buildx version buildx v0.3.0 c967f1d Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-14 11:34:28 +00:00
RUN GOOS="${GOOS}" GOARCH="${GOARCH}" BUILDX_COMMIT="${BUILDX_COMMIT}"; \
pkg="github.com/docker/buildx"; \
ldflags="\
-X \"${pkg}/version.Version=$(git describe --tags)\" \
-X \"${pkg}/version.Revision=$(git rev-parse --short HEAD)\" \
-X \"${pkg}/version.Package=buildx\" \
"; \
Dockerfile.buildx: bump to Go 1.13.10 Looks like this Dockerfile was not yet updated; possibly because `go mod` issues when building buildx 0.3.1. Given that the upstream repository uses vendoring, I: - removed the `go mod download` step - added `-mod=vendor` to use vendoring mode Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-02 16:53:17 +00:00
go build -mod=vendor -ldflags "${ldflags}" -o /usr/bin/buildx ./cmd/buildx
make buildx: use multi-stage to make tagged image smaller The build-stage would still be in the local cache (and can be cleaned up with `docker system prune`) but the tagged image (which usually wouldn't be removed) will take up less space now. Note that - the binary is not statically linked, so we cannot use a "from scratch" image - in cases where the binary is cross-compiled (e.g. on a non-linux machine), the image itself is not really useful (we may want to consider not tagging the image in that situation) Before: REPOSITORY TAG IMAGE ID CREATED SIZE moby-buildx latest c9b2af465baf 7 minutes ago 1.71GB After: REPOSITORY TAG IMAGE ID CREATED SIZE moby-buildx latest 345501e2df0a 2 minutes ago 820MB Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-14 13:27:52 +00:00
Switch all Dockerfiles to use "buster" variant Commit 4e3ab9e9fbca682f75eb350c8ad4312282869a03 switched the main Dockerfile to the "buster" variant, but did not update some of the other Dockerfiles. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-24 12:31:04 +00:00
FROM golang:${GO_VERSION}-buster
make buildx: use multi-stage to make tagged image smaller The build-stage would still be in the local cache (and can be cleaned up with `docker system prune`) but the tagged image (which usually wouldn't be removed) will take up less space now. Note that - the binary is not statically linked, so we cannot use a "from scratch" image - in cases where the binary is cross-compiled (e.g. on a non-linux machine), the image itself is not really useful (we may want to consider not tagging the image in that situation) Before: REPOSITORY TAG IMAGE ID CREATED SIZE moby-buildx latest c9b2af465baf 7 minutes ago 1.71GB After: REPOSITORY TAG IMAGE ID CREATED SIZE moby-buildx latest 345501e2df0a 2 minutes ago 820MB Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-14 13:27:52 +00:00
COPY --from=build /usr/bin/buildx /usr/bin/buildx
make buildx: fix variable substitution and version The variables were not substituted, because single-quotes were used. While at it; change the fixed version/commit to use the actual commit and version, using git. before this change: make buildx && ./bundles/buildx version github.com/docker/buildx ${BUILDX_COMMIT} ${BUILDX_COMMIT} after this change: make buildx && ./bundles/buildx version buildx v0.3.0 c967f1d Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-14 11:34:28 +00:00
ENTRYPOINT ["/usr/bin/buildx"]
Reference in a new issue Copy permalink