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

464 lines
19 KiB
Docker
Raw Normal View History

Dockerfile: update to latest syntax It was pinned to the 1.3 version; removing the minor version to make sure we're on the latest 1.x stable. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-07-02 15:01:57 +00:00
# syntax=docker/dockerfile:1
Add usage instructions to the Dockerfile. Build, test and release docker using docker.
2013-09-07 02:58:05 +00:00
Support cross-compile for arm Pretty much cross-compile doesn't work because of this: > profiles/seccomp/seccomp.go:13:2: build constraints exclude all Go files in /go/src/github.com/docker/docker/vendor/github.com/seccomp/libseccomp-golang This changes adds a new Dockerfile target for cross compilation with the neccesary arch specific libseccomp packages and CC toolchains. Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-06 00:20:06 +00:00
ARG CROSS="false"
integration: use systemd when $DOCKER_SYSTEMD is set Fix #40492 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-10 17:55:16 +00:00
ARG SYSTEMD="false"
update to go1.19.4 Includes security fixes for net/http (CVE-2022-41717, CVE-2022-41720), and os (CVE-2022-41720). These minor releases include 2 security fixes following the security policy: - os, net/http: avoid escapes from os.DirFS and http.Dir on Windows The os.DirFS function and http.Dir type provide access to a tree of files rooted at a given directory. These functions permitted access to Windows device files under that root. For example, os.DirFS("C:/tmp").Open("COM1") would open the COM1 device. Both os.DirFS and http.Dir only provide read-only filesystem access. In addition, on Windows, an os.DirFS for the directory \(the root of the current drive) can permit a maliciously crafted path to escape from the drive and access any path on the system. The behavior of os.DirFS("") has changed. Previously, an empty root was treated equivalently to "/", so os.DirFS("").Open("tmp") would open the path "/tmp". This now returns an error. This is CVE-2022-41720 and Go issue https://go.dev/issue/56694. - net/http: limit canonical header cache by bytes, not entries An attacker can cause excessive memory growth in a Go server accepting HTTP/2 requests. HTTP/2 server connections contain a cache of HTTP header keys sent by the client. While the total number of entries in this cache is capped, an attacker sending very large keys can cause the server to allocate approximately 64 MiB per open connection. This issue is also fixed in golang.org/x/net/http2 vX.Y.Z, for users manually configuring HTTP/2. Thanks to Josselin Costanzi for reporting this issue. This is CVE-2022-41717 and Go issue https://go.dev/issue/56350. View the release notes for more information: https://go.dev/doc/devel/release#go1.19.4 And the milestone on the issue tracker: https://github.com/golang/go/issues?q=milestone%3AGo1.19.4+label%3ACherryPickApproved Full diff: https://github.com/golang/go/compare/go1.19.3...go1.19.4 The golang.org/x/net fix is in https://github.com/golang/net/commit/1e63c2f08a10a150fa02c50ece89b340ae64efe4 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-12-06 21:57:25 +00:00
ARG GO_VERSION=1.19.4
Dockerfile: use DEBIAN_FRONTEND=noninteractive Using a build-arg so that we don't have to specify it for each `apt-get install`, and to preserve that the `DEBIAN_FRONTEND` is preserved in the image itself (which changes the default behavior, and can be surprising if the image is run interactively).` With this patch, some (harmless, but possibly confusing) errors are no longer printed during build, for example: ```patch Unpacking libgcc1:armhf (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:armhf. Preparing to unpack .../04-libc6_2.24-11+deb9u4_armhf.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline Unpacking libc6:armhf (2.24-11+deb9u4) ... Selecting previously unselected package libgcc1:arm64. Preparing to unpack .../05-libgcc1_1%3a6.3.0-18+deb9u1_arm64.deb ... Unpacking libgcc1:arm64 (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:arm64. Preparing to unpack .../06-libc6_2.24-11+deb9u4_arm64.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline ``` Looks like some output is now also printed on stdout instead of stderr Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-11 15:08:33 +00:00
ARG DEBIAN_FRONTEND=noninteractive
Include VPNkit binary for arm64 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-02-24 05:05:38 +00:00
ARG VPNKIT_VERSION=0.5.0
Allow download-frozen-images to work without `go` Currently we use the `go` command to read GOARCH and use the value for matching manifests. This change allows: 1. Specifying the arch through `TARGETARCH` 2. Falling back to `dpkg` if `go` is not available 3. Falling back to `uname -m` if `dpkg` is not available 4. A default value (amd64) if none of these commands is available. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-18 22:40:45 +00:00
Dockerfile: update to debian bullseye Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-19 19:16:01 +00:00
ARG BASE_DEBIAN_DISTRO="bullseye"
Allow download-frozen-images to work without `go` Currently we use the `go` command to read GOARCH and use the value for matching manifests. This change allows: 1. Specifying the arch through `TARGETARCH` 2. Falling back to `dpkg` if `go` is not available 3. Falling back to `uname -m` if `dpkg` is not available 4. A default value (amd64) if none of these commands is available. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-18 22:40:45 +00:00
ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
Support cross-compile for arm Pretty much cross-compile doesn't work because of this: > profiles/seccomp/seccomp.go:13:2: build constraints exclude all Go files in /go/src/github.com/docker/docker/vendor/github.com/seccomp/libseccomp-golang This changes adds a new Dockerfile target for cross compilation with the neccesary arch specific libseccomp packages and CC toolchains. Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-06 00:20:06 +00:00
build Dockerfile allows arg for base build FROM Issue: https://github.com/moby/moby/issues/35729 - Dockerfile now has an ARG for fully specifying GOLANG base image used for build - Base image defaults to current patter * This allows testing of alternate GOLANG environments * Required downstream (EE) for things like FIPS testing Signed-off-by: James Nesbitt <jnesbitt@mirantis.com>
2020-03-30 14:27:59 +00:00
FROM ${GOLANG_IMAGE} AS base
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
Dockerfile: Use APT_MIRROR for security.debian.org as well The fastly cdn mirror we're using also mirrors the debian security repository; ``` Welcome to deb.debian.org (fastly instance)! This is deb.debian.org. This service provides mirrors for the following Debian archive repositories: /debian/ /debian-debug/ /debian-ports/ /debian-security/ The server deb.debian.org does not have packages itself, but the name has SRV records in DNS that let apt in stretch and later find places. ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-16 10:16:56 +00:00
ARG APT_MIRROR
RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
&& sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list
Dockerfile: set GO111MODULE=off Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-09-11 07:36:53 +00:00
ENV GO111MODULE=off
allow replacing httpredir or deb mirror in jessie Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-11-20 22:14:51 +00:00
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
FROM base AS criu
Dockerfile: use DEBIAN_FRONTEND=noninteractive Using a build-arg so that we don't have to specify it for each `apt-get install`, and to preserve that the `DEBIAN_FRONTEND` is preserved in the image itself (which changes the default behavior, and can be surprising if the image is run interactively).` With this patch, some (harmless, but possibly confusing) errors are no longer printed during build, for example: ```patch Unpacking libgcc1:armhf (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:armhf. Preparing to unpack .../04-libc6_2.24-11+deb9u4_armhf.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline Unpacking libc6:armhf (2.24-11+deb9u4) ... Selecting previously unselected package libgcc1:arm64. Preparing to unpack .../05-libgcc1_1%3a6.3.0-18+deb9u1_arm64.deb ... Unpacking libgcc1:arm64 (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:arm64. Preparing to unpack .../06-libc6_2.24-11+deb9u4_arm64.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline ``` Looks like some output is now also printed on stdout instead of stderr Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-11 15:08:33 +00:00
ARG DEBIAN_FRONTEND
Dockerfile: switch CRIU install to Debian 11 "bullseye" packages There's a package repository for Debian 11 "bullseye" now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-27 11:34:41 +00:00
ADD --chmod=0644 https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_11/Release.key /etc/apt/trusted.gpg.d/criu.gpg.asc
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,sharing=locked,id=moby-criu-aptlib,target=/var/lib/apt \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,sharing=locked,id=moby-criu-aptcache,target=/var/cache/apt \
Dockerfile: switch CRIU install to Debian 11 "bullseye" packages There's a package repository for Debian 11 "bullseye" now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-27 11:34:41 +00:00
echo 'deb https://download.opensuse.org/repositories/devel:/tools:/criu/Debian_11/ /' > /etc/apt/sources.list.d/criu.list \
Dockerfile: install criu from binary repo Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-12-02 01:02:42 +00:00
&& apt-get update \
&& apt-get install -y --no-install-recommends criu \
&& install -D /usr/sbin/criu /build/criu
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
Use golang official image instead debian stretch Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-27 08:20:55 +00:00
FROM base AS registry
Dockerfile: use tmpfs for building registry, go-swagger Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-10 13:07:01 +00:00
WORKDIR /go/src/github.com/docker/distribution
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
Dockerfile: update test-registries to released versions - using v2.1.0 for the "v1" registry (last release with only v1) - using v2.3.0 as "current" version (was v2.3.0-rc.0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-24 14:47:18 +00:00
# REGISTRY_VERSION specifies the version of the registry to build and install
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
# from the https://github.com/docker/distribution repository. This version of
# the registry is used to test both schema 1 and schema 2 manifests. Generally,
# the version specified here should match a current release.
Dockerfile: update test-registries to released versions - using v2.1.0 for the "v1" registry (last release with only v1) - using v2.3.0 as "current" version (was v2.3.0-rc.0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-24 14:47:18 +00:00
ARG REGISTRY_VERSION=v2.3.0
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
all: fix typos Signed-off-by: cuishuang <imcusg@gmail.com>
2022-03-01 06:26:35 +00:00
# REGISTRY_VERSION_SCHEMA1 specifies the version of the registry to build and
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
# install from the https://github.com/docker/distribution repository. This is
# an older (pre v2.3.0) version of the registry that only supports schema1
# manifests. This version of the registry is not working on arm64, so installation
# is skipped on that architecture.
Dockerfile: update test-registries to released versions - using v2.1.0 for the "v1" registry (last release with only v1) - using v2.3.0 as "current" version (was v2.3.0-rc.0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-24 14:47:18 +00:00
ARG REGISTRY_VERSION_SCHEMA1=v2.1.0
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: use tmpfs for building registry, go-swagger Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-10 13:07:01 +00:00
--mount=type=tmpfs,target=/go/src/ \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
set -x \
Dockerfile: use tmpfs for building registry, go-swagger Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-10 13:07:01 +00:00
&& git clone https://github.com/docker/distribution.git . \
Dockerfile: update test-registries to released versions - using v2.1.0 for the "v1" registry (last release with only v1) - using v2.3.0 as "current" version (was v2.3.0-rc.0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-24 14:47:18 +00:00
&& git checkout -q "$REGISTRY_VERSION" \
Dockerfile: use tmpfs for building registry, go-swagger Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-10 13:07:01 +00:00
&& GOPATH="/go/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
go build -buildmode=pie -o /build/registry-v2 github.com/docker/distribution/cmd/registry \
&& case $(dpkg --print-architecture) in \
Dockerfile: also build old registry on armhf Building the old version of the registry is not supported on arm64, but building on armhf is possible. Before using a multi-arch Dockerfile, the registry was built on armhf as well, but this got lost in the transition in commit f1701a741d77a92d28138944193e23aabfc74abe. This commit re-enables building the old registry on armhf. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-10 13:32:46 +00:00
amd64|armhf|ppc64*|s390x) \
Dockerfile: update test-registries to released versions - using v2.1.0 for the "v1" registry (last release with only v1) - using v2.3.0 as "current" version (was v2.3.0-rc.0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-09-24 14:47:18 +00:00
git checkout -q "$REGISTRY_VERSION_SCHEMA1"; \
Dockerfile: use tmpfs for building registry, go-swagger Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-10 13:07:01 +00:00
GOPATH="/go/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH"; \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
go build -buildmode=pie -o /build/registry-v2-schema1 github.com/docker/distribution/cmd/registry; \
;; \
Dockerfile: use tmpfs for building registry, go-swagger Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-10 13:07:01 +00:00
esac
Update Dockerfile to use Godeps for distribution Update our "registry" install to use the included Godeps libraries so that it doesn't require anything from our current source (hence moving it up for better caching too) Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-01-21 03:40:19 +00:00
Use golang official image instead debian stretch Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-02-27 08:20:55 +00:00
FROM base AS swagger
Dockerfile: use tmpfs for building registry, go-swagger Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-10 13:07:01 +00:00
WORKDIR $GOPATH/src/github.com/go-swagger/go-swagger
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
# GO_SWAGGER_COMMIT specifies the version of the go-swagger binary to build and
# install. Go-swagger is used in CI for validating swagger.yaml in hack/validate/swagger-gen
#
# Currently uses a fork from https://github.com/kolyshkin/go-swagger/tree/golang-1.13-fix,
go-swagger: fix panic This is an attempt to fix go-swagger panic under Golang 1.13. Details: * https://github.com/go-openapi/jsonpointer/pull/4 * https://github.com/go-swagger/go-swagger/pull/2059 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2019-10-04 01:57:29 +00:00
# TODO: move to under moby/ or fix upstream go-swagger to work for us.
Dockerfile: update go-swagger to fix validation on Go1.16 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-07-02 13:00:47 +00:00
ENV GO_SWAGGER_COMMIT c56166c036004ba7a3a321e5951ba472b9ae298c
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: use tmpfs for building registry, go-swagger Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-10 13:07:01 +00:00
--mount=type=tmpfs,target=/go/src/ \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
set -x \
Dockerfile: use tmpfs for building registry, go-swagger Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-10 13:07:01 +00:00
&& git clone https://github.com/kolyshkin/go-swagger.git . \
&& git checkout -q "$GO_SWAGGER_COMMIT" \
&& go build -o /build/swagger github.com/go-swagger/go-swagger/cmd/swagger
Add swagger.yaml validation - yamllint to ensure it is a valid YAML file - go-swagger validate to ensure it is a valid swagger file Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-03 17:15:27 +00:00
Dockerfile: variant support in frozen-images stage using TARGETVARIANT in frozen-images stage implies changes in `download-frozen-image-v2.sh` script to add support for variants so we are able to build against more platforms. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-08 14:13:41 +00:00
# frozen-images
# See also frozenImages in "testutil/environment/protect.go" (which needs to
# be updated when adding images to this list)
Allow download-frozen-images to work without `go` Currently we use the `go` command to read GOARCH and use the value for matching manifests. This change allows: 1. Specifying the arch through `TARGETARCH` 2. Falling back to `dpkg` if `go` is not available 3. Falling back to `uname -m` if `dpkg` is not available 4. A default value (amd64) if none of these commands is available. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-18 22:40:45 +00:00
FROM debian:${BASE_DEBIAN_DISTRO} AS frozen-images
Dockerfile: use DEBIAN_FRONTEND=noninteractive Using a build-arg so that we don't have to specify it for each `apt-get install`, and to preserve that the `DEBIAN_FRONTEND` is preserved in the image itself (which changes the default behavior, and can be surprising if the image is run interactively).` With this patch, some (harmless, but possibly confusing) errors are no longer printed during build, for example: ```patch Unpacking libgcc1:armhf (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:armhf. Preparing to unpack .../04-libc6_2.24-11+deb9u4_armhf.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline Unpacking libc6:armhf (2.24-11+deb9u4) ... Selecting previously unselected package libgcc1:arm64. Preparing to unpack .../05-libgcc1_1%3a6.3.0-18+deb9u1_arm64.deb ... Unpacking libgcc1:arm64 (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:arm64. Preparing to unpack .../06-libc6_2.24-11+deb9u4_arm64.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline ``` Looks like some output is now also printed on stdout instead of stderr Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-11 15:08:33 +00:00
ARG DEBIAN_FRONTEND
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,sharing=locked,id=moby-frozen-images-aptlib,target=/var/lib/apt \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,sharing=locked,id=moby-frozen-images-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
Allow download-frozen-images to work without `go` Currently we use the `go` command to read GOARCH and use the value for matching manifests. This change allows: 1. Specifying the arch through `TARGETARCH` 2. Falling back to `dpkg` if `go` is not available 3. Falling back to `uname -m` if `dpkg` is not available 4. A default value (amd64) if none of these commands is available. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-18 22:40:45 +00:00
curl \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
jq
Refactor busybox downloading as generic "frozen-images" This makes it much simpler to add new "frozen" images -- simply add them to the `Dockerfile` and in `hack/make/.ensure-frozen-images` and you're off to the races. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-07 01:12:41 +00:00
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
COPY contrib/download-frozen-image-v2.sh /
Add TARGETARCH var to frozen images stage This allows the arch that buildkit passes through to be used for the frozen image downloader. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-09-29 22:39:49 +00:00
ARG TARGETARCH
Dockerfile: variant support in frozen-images stage using TARGETVARIANT in frozen-images stage implies changes in `download-frozen-image-v2.sh` script to add support for variants so we are able to build against more platforms. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-09-08 14:13:41 +00:00
ARG TARGETVARIANT
Standardize artefact path for all build stages Update all build stages to output artefacts to /build Signed-off-by: Jeff Hajewski <jeff.hajewski@gmail.com>
2018-04-13 18:45:57 +00:00
RUN /download-frozen-image-v2.sh /build \
Upgrading the versions of images in Dockerfile. In order to run tests at mips64el device. Now official-images has supported the following images for mips64el. buildpack-deps:stretch buildpack-deps:buster debian:stretch debian:buster But official-images does not support the following images for mips64el. debian:jessie buildpack-deps:jessie Signed-off-by: wanghuaiqing <wanghuaiqing@loongson.cn>
2020-06-30 03:06:03 +00:00
busybox:latest@sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209 \
busybox:glibc@sha256:1f81263701cddf6402afe9f33fca0266d9fff379e59b1748f33d3072da71ee85 \
Dockerfile: frozen images: update to bullseye, remove buildpack-dep Update the frozen images to also be based on Debian bullseye. Using the "slim" variant (which looks to have all we're currently using), and remove the buildpack-dep frozen image. The buildpack-dep image is quite large, and it looks like we only use it to compile some C binaries, which should work fine on a regular debian image; docker build -t debian:bullseye-slim-gcc -<<EOF FROM debian:bullseye-slim RUN apt-get update && apt-get install -y gcc libc6-dev --no-install-recommends EOF docker image ls REPOSITORY TAG IMAGE ID CREATED SIZE debian bullseye-slim-gcc 1851750242af About a minute ago 255MB buildpack-deps bullseye fe8fece98de2 2 days ago 834MB Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-19 21:40:38 +00:00
debian:bullseye-slim@sha256:dacf278785a4daa9de07596ec739dbc07131e189942772210709c5c0777e8437 \
Don't set default platform on container create This fixes a regression based on expectations of the runtime: ``` docker pull arm32v7/alpine docker run arm32v7/alpine ``` Without this change, the `docker run` will fail due to platform matching on non-arm32v7 systems, even though the image could run (assuming the system is setup correctly). This also emits a warning to make sure that the user is aware that a platform that does not match the default platform of the system is being run, for the cases like: ``` docker pull --platform armhf busybox docker run busybox ``` Not typically an issue if the requests are done together like that, but if the image was already there and someone did `docker run` without an explicit `--platform`, they may very well be expecting to run a native version of the image instead of the armhf one. This warning does add some extra noise in the case of platform specific images being run, such as `arm32v7/alpine`, but this can be supressed by explicitly setting the platform. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-10-15 23:01:17 +00:00
hello-world:latest@sha256:d58e752213a51785838f9eed2b7a498ffa1cb3aa7f946dda11af39286c3db9a9 \
arm32v7/hello-world:latest@sha256:50b8560ad574c779908da71f7ce370c0a2471c098d44d1c8f6b513c5a55eeeb1
Download busybox from the Hub instead of GitHub This downloads a specific image ID of `busybox:latest` from the Hub directly (within the `Dockerfile`, ready for `docker load`) instead of grabbing the source from GitHub and doing a `docker build` at daemon start time. This ensures the test suite runs more consistently. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-28 05:53:36 +00:00
Make CC toolchains available for other targets This cross-compiling other binaries simpler. It would be nice if the cross Makefile target built all the required bins, but at least this is a first step. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-04-16 23:31:49 +00:00
FROM base AS cross-false
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
Fix `make cross` target When changing the various cross targets in the Dockerfile I neglected some `;`. Instead of dealing with that now this just sets `--platform` on the cross specific targets which only work on linux/amd64 anyway. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-10-08 17:54:39 +00:00
FROM --platform=linux/amd64 base AS cross-true
Dockerfile: use DEBIAN_FRONTEND=noninteractive Using a build-arg so that we don't have to specify it for each `apt-get install`, and to preserve that the `DEBIAN_FRONTEND` is preserved in the image itself (which changes the default behavior, and can be surprising if the image is run interactively).` With this patch, some (harmless, but possibly confusing) errors are no longer printed during build, for example: ```patch Unpacking libgcc1:armhf (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:armhf. Preparing to unpack .../04-libc6_2.24-11+deb9u4_armhf.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline Unpacking libc6:armhf (2.24-11+deb9u4) ... Selecting previously unselected package libgcc1:arm64. Preparing to unpack .../05-libgcc1_1%3a6.3.0-18+deb9u1_arm64.deb ... Unpacking libgcc1:arm64 (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:arm64. Preparing to unpack .../06-libc6_2.24-11+deb9u4_arm64.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline ``` Looks like some output is now also printed on stdout instead of stderr Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-11 15:08:33 +00:00
ARG DEBIAN_FRONTEND
Support cross-compile for arm Pretty much cross-compile doesn't work because of this: > profiles/seccomp/seccomp.go:13:2: build constraints exclude all Go files in /go/src/github.com/docker/docker/vendor/github.com/seccomp/libseccomp-golang This changes adds a new Dockerfile target for cross compilation with the neccesary arch specific libseccomp packages and CC toolchains. Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-06 00:20:06 +00:00
RUN dpkg --add-architecture arm64
RUN dpkg --add-architecture armel
Dockerfile: sort packages alphabetically Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:56:32 +00:00
RUN dpkg --add-architecture armhf
Add ppc64le to cross platforms target debian uses ppc64el go uses ppc64le the cross compiler is powerpc64le Signed-off-by: Frédéric Dalleau <frederic.dalleau@docker.com>
2021-06-15 08:49:04 +00:00
RUN dpkg --add-architecture ppc64el
Add s390x to cross platforms target Update build script and buid environment for supporting s390x Signed-off-by: Frédéric Dalleau <frederic.dalleau@docker.com>
2021-06-14 09:06:42 +00:00
RUN dpkg --add-architecture s390x
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,sharing=locked,id=moby-cross-true-aptlib,target=/var/lib/apt \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,sharing=locked,id=moby-cross-true-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
Dockerfile: sort packages alphabetically Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:56:32 +00:00
crossbuild-essential-arm64 \
crossbuild-essential-armel \
Add ppc64le to cross platforms target debian uses ppc64el go uses ppc64le the cross compiler is powerpc64le Signed-off-by: Frédéric Dalleau <frederic.dalleau@docker.com>
2021-06-15 08:49:04 +00:00
crossbuild-essential-armhf \
Add s390x to cross platforms target Update build script and buid environment for supporting s390x Signed-off-by: Frédéric Dalleau <frederic.dalleau@docker.com>
2021-06-14 09:06:42 +00:00
crossbuild-essential-ppc64el \
crossbuild-essential-s390x
Make CC toolchains available for other targets This cross-compiling other binaries simpler. It would be nice if the cross Makefile target built all the required bins, but at least this is a first step. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-04-16 23:31:49 +00:00
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
FROM cross-${CROSS} AS dev-base
Make CC toolchains available for other targets This cross-compiling other binaries simpler. It would be nice if the cross Makefile target built all the required bins, but at least this is a first step. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-04-16 23:31:49 +00:00
FROM dev-base AS runtime-dev-cross-false
Dockerfile: use DEBIAN_FRONTEND=noninteractive Using a build-arg so that we don't have to specify it for each `apt-get install`, and to preserve that the `DEBIAN_FRONTEND` is preserved in the image itself (which changes the default behavior, and can be surprising if the image is run interactively).` With this patch, some (harmless, but possibly confusing) errors are no longer printed during build, for example: ```patch Unpacking libgcc1:armhf (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:armhf. Preparing to unpack .../04-libc6_2.24-11+deb9u4_armhf.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline Unpacking libc6:armhf (2.24-11+deb9u4) ... Selecting previously unselected package libgcc1:arm64. Preparing to unpack .../05-libgcc1_1%3a6.3.0-18+deb9u1_arm64.deb ... Unpacking libgcc1:arm64 (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:arm64. Preparing to unpack .../06-libc6_2.24-11+deb9u4_arm64.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline ``` Looks like some output is now also printed on stdout instead of stderr Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-11 15:08:33 +00:00
ARG DEBIAN_FRONTEND
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,sharing=locked,id=moby-cross-false-aptlib,target=/var/lib/apt \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,sharing=locked,id=moby-cross-false-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
binary targets do not need the dev environment This makes the binary build targets use a minimal build env instead of having to build all the stuff needed for the full dev enviornment. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 20:11:49 +00:00
binutils-mingw-w64 \
g++-mingw-w64-x86-64 \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
libapparmor-dev \
Dockerfile: switch golang image to "buster" variant, and update btrfs packages The btrfs-tools was a transitional package, and no longer exists: > Package btrfs-tools > stretch (oldstable) (admin): transitional dummy package > 4.7.3-1: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x It must be replaced either by `btrfs-progs` or `libbtrfs-dev` (which has just the development headers) > Package: libbtrfs-dev (4.20.1-2) > Checksumming Copy on Write Filesystem utilities (development headers) Note that the `libbtrfs-dev` package is not available on Debian stretch (only in stretch-backports) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-17 12:37:56 +00:00
libbtrfs-dev \
binary targets do not need the dev environment This makes the binary build targets use a minimal build env instead of having to build all the stuff needed for the full dev enviornment. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 20:11:49 +00:00
libdevmapper-dev \
Dockerfile: update to debian bullseye Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-19 19:16:01 +00:00
libseccomp-dev \
binary targets do not need the dev environment This makes the binary build targets use a minimal build env instead of having to build all the stuff needed for the full dev enviornment. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 20:11:49 +00:00
libsystemd-dev \
libudev-dev
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
binary targets do not need the dev environment This makes the binary build targets use a minimal build env instead of having to build all the stuff needed for the full dev enviornment. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 20:11:49 +00:00
FROM --platform=linux/amd64 runtime-dev-cross-false AS runtime-dev-cross-true
Dockerfile: use DEBIAN_FRONTEND=noninteractive Using a build-arg so that we don't have to specify it for each `apt-get install`, and to preserve that the `DEBIAN_FRONTEND` is preserved in the image itself (which changes the default behavior, and can be surprising if the image is run interactively).` With this patch, some (harmless, but possibly confusing) errors are no longer printed during build, for example: ```patch Unpacking libgcc1:armhf (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:armhf. Preparing to unpack .../04-libc6_2.24-11+deb9u4_armhf.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline Unpacking libc6:armhf (2.24-11+deb9u4) ... Selecting previously unselected package libgcc1:arm64. Preparing to unpack .../05-libgcc1_1%3a6.3.0-18+deb9u1_arm64.deb ... Unpacking libgcc1:arm64 (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:arm64. Preparing to unpack .../06-libc6_2.24-11+deb9u4_arm64.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline ``` Looks like some output is now also printed on stdout instead of stderr Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-11 15:08:33 +00:00
ARG DEBIAN_FRONTEND
Support cross-compile for arm Pretty much cross-compile doesn't work because of this: > profiles/seccomp/seccomp.go:13:2: build constraints exclude all Go files in /go/src/github.com/docker/docker/vendor/github.com/seccomp/libseccomp-golang This changes adds a new Dockerfile target for cross compilation with the neccesary arch specific libseccomp packages and CC toolchains. Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-06 00:20:06 +00:00
# These crossbuild packages rely on gcc-<arch>, but this doesn't want to install
all: fix typos Signed-off-by: cuishuang <imcusg@gmail.com>
2022-03-01 06:26:35 +00:00
# on non-amd64 systems, so other architectures cannot crossbuild amd64.
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,sharing=locked,id=moby-cross-true-aptlib,target=/var/lib/apt \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,sharing=locked,id=moby-cross-true-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
libapparmor-dev:arm64 \
libapparmor-dev:armel \
Add ppc64le to cross platforms target debian uses ppc64el go uses ppc64le the cross compiler is powerpc64le Signed-off-by: Frédéric Dalleau <frederic.dalleau@docker.com>
2021-06-15 08:49:04 +00:00
libapparmor-dev:armhf \
Add s390x to cross platforms target Update build script and buid environment for supporting s390x Signed-off-by: Frédéric Dalleau <frederic.dalleau@docker.com>
2021-06-14 09:06:42 +00:00
libapparmor-dev:ppc64el \
Dockerfile: add back libseccomp-dev to cross-compile runc commit 7168d98c434af0a35e8c9a05dfb87bb40511a38a removed these, but we overlooked that the same stage is used to build runc as well, so we likely need these. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-19 19:32:18 +00:00
libapparmor-dev:s390x \
libseccomp-dev:arm64 \
libseccomp-dev:armel \
libseccomp-dev:armhf \
libseccomp-dev:ppc64el \
libseccomp-dev:s390x
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
Support cross-compile for arm Pretty much cross-compile doesn't work because of this: > profiles/seccomp/seccomp.go:13:2: build constraints exclude all Go files in /go/src/github.com/docker/docker/vendor/github.com/seccomp/libseccomp-golang This changes adds a new Dockerfile target for cross compilation with the neccesary arch specific libseccomp packages and CC toolchains. Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-06 00:20:06 +00:00
FROM runtime-dev-cross-${CROSS} AS runtime-dev
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
Added Delve debugger to the development container (including instructions in the contribution guide). Signed-off-by: Konrad Ponichtera <konpon96@gmail.com>
2022-02-20 18:21:10 +00:00
FROM base AS delve
# DELVE_VERSION specifies the version of the Delve debugger binary
# from the https://github.com/go-delve/delve repository.
# It can be used to run Docker with a possibility of
# attaching debugger to it.
#
ARG DELVE_VERSION=v1.8.1
Dockerfile: don't install delve on ppc64le, s390x Delve on Linux is currently only supported on amd64 and arm64; https://github.com/go-delve/delve/blob/v1.8.1/pkg/proc/native/support_sentinel.go#L1-L6 On ppc64le and s390x, trying to install and run it, caused the build to fail: RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg/mod GOBIN=/build/ GO111MODULE=on go install "github.com/go-delve/delve/cmd/dlv@v1.8.1" && /build/dlv --help: pkg/mod/github.com/go-delve/delve@v1.8.1/service/debugger/debugger.go:28:2: found packages native (dump_linux.go) and your_operating_system_and_architecture_combination_is_not_supported_by_delve (support_sentinel.go) in /go/pkg/mod/github.com/go-delve/delve@v1.8.1/pkg/proc/native Error: failed to solve: executor failed running [/bin/sh -c GOBIN=/build/ GO111MODULE=on go install "github.com/go-delve/delve/cmd/dlv@${DELVE_VERSION}" && /build/dlv --help]: exit code: 1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-07-02 13:39:02 +00:00
# Delve on Linux is currently only supported on amd64 and arm64;
# https://github.com/go-delve/delve/blob/v1.8.1/pkg/proc/native/support_sentinel.go#L1-L6
Added Delve debugger to the development container (including instructions in the contribution guide). Signed-off-by: Konrad Ponichtera <konpon96@gmail.com>
2022-02-20 18:21:10 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: don't install delve on ppc64le, s390x Delve on Linux is currently only supported on amd64 and arm64; https://github.com/go-delve/delve/blob/v1.8.1/pkg/proc/native/support_sentinel.go#L1-L6 On ppc64le and s390x, trying to install and run it, caused the build to fail: RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg/mod GOBIN=/build/ GO111MODULE=on go install "github.com/go-delve/delve/cmd/dlv@v1.8.1" && /build/dlv --help: pkg/mod/github.com/go-delve/delve@v1.8.1/service/debugger/debugger.go:28:2: found packages native (dump_linux.go) and your_operating_system_and_architecture_combination_is_not_supported_by_delve (support_sentinel.go) in /go/pkg/mod/github.com/go-delve/delve@v1.8.1/pkg/proc/native Error: failed to solve: executor failed running [/bin/sh -c GOBIN=/build/ GO111MODULE=on go install "github.com/go-delve/delve/cmd/dlv@${DELVE_VERSION}" && /build/dlv --help]: exit code: 1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-07-02 13:39:02 +00:00
case $(dpkg --print-architecture) in \
amd64|arm64) \
GOBIN=/build/ GO111MODULE=on go install "github.com/go-delve/delve/cmd/dlv@${DELVE_VERSION}" \
&& /build/dlv --help \
;; \
*) \
mkdir -p /build/ \
;; \
esac
Added Delve debugger to the development container (including instructions in the contribution guide). Signed-off-by: Konrad Ponichtera <konpon96@gmail.com>
2022-02-20 18:21:10 +00:00
validate/toml: switch to github.com/pelletier/go-toml The github.com/BurntSushi/toml project is no longer maintained, and containerd is switching to this project instead, so start moving our code as well. This patch only changes the binary used during validation (tbh, we could probably remove this validation step, but leaving that for now). I manually verified that the hack/verify/toml still works by adding a commit that makes the MAINTAINERS file invalid; diff --git a/MAINTAINERS b/MAINTAINERS index b739e7e20c..81ababd8de 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23,7 +23,7 @@ # a subsystem, they are responsible for doing so and holding the # subsystem maintainers accountable. If ownership is unclear, they are the de facto owners. - people = [ + people = "akihirosuda", "anusha", "coolljt0725", Running `hack/verify/toml` was able to detect the broken format; hack/validate/toml (27, 4): keys cannot contain , characterThese files are not valid TOML: - MAINTAINERS Please reformat the above files as valid TOML Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-02 14:02:34 +00:00
FROM base AS tomll
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
# GOTOML_VERSION specifies the version of the tomll binary to build and install
# from the https://github.com/pelletier/go-toml repository. This binary is used
# in CI in the hack/validate/toml script.
#
# When updating this version, consider updating the github.com/pelletier/go-toml
vendor: replace vndr with `go mod vendor` - use `vendor.mod` instead of `go.mod` to avoid issues to do with use of CalVer, not SemVer - ensure most of the dependency versions do not change - only zookeeper client has to change (via docker/libkv#218) as previously used version is no longer maintained and has missing dependencies Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-12-15 19:35:04 +00:00
# dependency in vendor.mod accordingly.
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
ARG GOTOML_VERSION=v1.8.1
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
GOBIN=/build/ GO111MODULE=on go install "github.com/pelletier/go-toml/cmd/tomll@${GOTOML_VERSION}" \
&& /build/tomll --help
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
use go-winres for cross to create Windows resources Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-04-14 17:52:23 +00:00
FROM base AS gowinres
# GOWINRES_VERSION defines go-winres tool version
update github.com/tc-hib/go-winres v0.3.0 to fix schema version in manifest - Fix xml schema version in manifest - Provide more verbose error on failed git tag resolution full diffs: - https://github.com/tc-hib/go-winres/compare/v0.2.3...v0.3.0 - https://github.com/tc-hib/winres/compare/v0.1.5...v0.1.6 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-17 16:32:06 +00:00
ARG GOWINRES_VERSION=v0.3.0
use go-winres for cross to create Windows resources Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-04-14 17:52:23 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
GOBIN=/build/ GO111MODULE=on go install "github.com/tc-hib/go-winres@${GOWINRES_VERSION}" \
&& /build/go-winres --help
Make CC toolchains available for other targets This cross-compiling other binaries simpler. It would be nice if the cross Makefile target built all the required bins, but at least this is a first step. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-04-16 23:31:49 +00:00
FROM dev-base AS containerd
Dockerfile: use DEBIAN_FRONTEND=noninteractive Using a build-arg so that we don't have to specify it for each `apt-get install`, and to preserve that the `DEBIAN_FRONTEND` is preserved in the image itself (which changes the default behavior, and can be surprising if the image is run interactively).` With this patch, some (harmless, but possibly confusing) errors are no longer printed during build, for example: ```patch Unpacking libgcc1:armhf (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:armhf. Preparing to unpack .../04-libc6_2.24-11+deb9u4_armhf.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline Unpacking libc6:armhf (2.24-11+deb9u4) ... Selecting previously unselected package libgcc1:arm64. Preparing to unpack .../05-libgcc1_1%3a6.3.0-18+deb9u1_arm64.deb ... Unpacking libgcc1:arm64 (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:arm64. Preparing to unpack .../06-libc6_2.24-11+deb9u4_arm64.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline ``` Looks like some output is now also printed on stdout instead of stderr Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-11 15:08:33 +00:00
ARG DEBIAN_FRONTEND
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,sharing=locked,id=moby-containerd-aptlib,target=/var/lib/apt \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,sharing=locked,id=moby-containerd-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
Dockerfile: switch golang image to "buster" variant, and update btrfs packages The btrfs-tools was a transitional package, and no longer exists: > Package btrfs-tools > stretch (oldstable) (admin): transitional dummy package > 4.7.3-1: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x It must be replaced either by `btrfs-progs` or `libbtrfs-dev` (which has just the development headers) > Package: libbtrfs-dev (4.20.1-2) > Checksumming Copy on Write Filesystem utilities (development headers) Note that the `libbtrfs-dev` package is not available on Debian stretch (only in stretch-backports) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-17 12:37:56 +00:00
libbtrfs-dev
Dockerfile: use version for some utilities instead of commit-sha The golangci-lint, gotestsum, shfmt, and vndr utilities should generally be ok to be pinned by version instead of a specific sha. Also rename the corresponding env-vars / build-args accordingly: - GOLANGCI_LINT_COMMIT -> GOLANGCI_LINT_VERSION - GOTESTSUM_COMMIT -> GOTESTSUM_VERSION - SHFMT_COMMIT -> SHFMT_VERSION - VNDR_COMMIT -> VNDR_VERSION - CONTAINERD_COMMIT -> CONTAINERD_VERSION - RUNC_COMMIT -> RUNC_VERSION - ROOTLESS_COMMIT -> ROOTLESS_VERSION Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-07-26 12:48:52 +00:00
ARG CONTAINERD_VERSION
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
COPY /hack/dockerfile/install/install.sh /hack/dockerfile/install/containerd.installer /
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
PREFIX=/build /install.sh containerd
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
Replace gometalinter with golangci-lint Replacing gometalinter, because it has been deprecated, and the repository was archived. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-05 10:32:43 +00:00
FROM base AS golangci_lint
golangci-lint: update to v1.49.0 Remove the "deadcode", "structcheck", and "varcheck" linters, as they are deprecated: WARN [runner] The linter 'deadcode' is deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter. Replaced by unused. WARN [runner] The linter 'structcheck' is deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter. Replaced by unused. WARN [runner] The linter 'varcheck' is deprecated (since v1.49.0) due to: The owner seems to have abandoned the linter. Replaced by unused. WARN [linters context] structcheck is disabled because of generics. You can track the evolution of the generics support by following the https://github.com/golangci/golangci-lint/issues/2649. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-09-03 21:20:23 +00:00
# FIXME: when updating golangci-lint, remove the temporary "nolint" in https://github.com/moby/moby/blob/7860686a8df15eea9def9e6189c6f9eca031bb6f/libnetwork/networkdb/cluster.go#L246
ARG GOLANGCI_LINT_VERSION=v1.49.0
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
GOBIN=/build/ GO111MODULE=on go install "github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}" \
&& /build/golangci-lint --version
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
run unit tests and generate junit report Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2019-07-31 00:07:30 +00:00
FROM base AS gotestsum
update gotestsum to v1.8.2 release notes: https://github.com/gotestyourself/gotestsum/releases/tag/v1.8.2 - Show shuffle seed - Update tests, and cleanup formats - Update dependencies - Test against go1.19, remove go1.15 - Add project name to junit.xml output - Adding in support for s390x and ppc64le full diff: https://github.com/gotestyourself/gotestsum/compare/v1.8.1...v1.8.2 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-11-17 16:05:20 +00:00
ARG GOTESTSUM_VERSION=v1.8.2
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
GOBIN=/build/ GO111MODULE=on go install "gotest.tools/gotestsum@${GOTESTSUM_VERSION}" \
&& /build/gotestsum --version
run unit tests and generate junit report Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2019-07-31 00:07:30 +00:00
validate: add shfmt Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-29 15:31:43 +00:00
FROM base AS shfmt
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
ARG SHFMT_VERSION=v3.0.2
validate: add shfmt Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-29 15:31:43 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
GOBIN=/build/ GO111MODULE=on go install "mvdan.cc/sh/v3/cmd/shfmt@${SHFMT_VERSION}" \
&& /build/shfmt --version
validate: add shfmt Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-29 15:31:43 +00:00
Make CC toolchains available for other targets This cross-compiling other binaries simpler. It would be nice if the cross Makefile target built all the required bins, but at least this is a first step. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-04-16 23:31:49 +00:00
FROM dev-base AS dockercli
Use build args to override binary commits in dockerfile Signed-off-by: Justen Martin <jmart@the-coder.com>
2019-09-12 20:22:56 +00:00
ARG DOCKERCLI_CHANNEL
ARG DOCKERCLI_VERSION
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
COPY /hack/dockerfile/install/install.sh /hack/dockerfile/install/dockercli.installer /
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
PREFIX=/build /install.sh dockercli
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
FROM runtime-dev AS runc
Dockerfile: use version for some utilities instead of commit-sha The golangci-lint, gotestsum, shfmt, and vndr utilities should generally be ok to be pinned by version instead of a specific sha. Also rename the corresponding env-vars / build-args accordingly: - GOLANGCI_LINT_COMMIT -> GOLANGCI_LINT_VERSION - GOTESTSUM_COMMIT -> GOTESTSUM_VERSION - SHFMT_COMMIT -> SHFMT_VERSION - VNDR_COMMIT -> VNDR_VERSION - CONTAINERD_COMMIT -> CONTAINERD_VERSION - RUNC_COMMIT -> RUNC_VERSION - ROOTLESS_COMMIT -> ROOTLESS_VERSION Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-07-26 12:48:52 +00:00
ARG RUNC_VERSION
Use build args to override binary commits in dockerfile Signed-off-by: Justen Martin <jmart@the-coder.com>
2019-09-12 20:22:56 +00:00
ARG RUNC_BUILDTAGS
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
COPY /hack/dockerfile/install/install.sh /hack/dockerfile/install/runc.installer /
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
PREFIX=/build /install.sh runc
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
Make CC toolchains available for other targets This cross-compiling other binaries simpler. It would be nice if the cross Makefile target built all the required bins, but at least this is a first step. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-04-16 23:31:49 +00:00
FROM dev-base AS tini
Dockerfile: use DEBIAN_FRONTEND=noninteractive Using a build-arg so that we don't have to specify it for each `apt-get install`, and to preserve that the `DEBIAN_FRONTEND` is preserved in the image itself (which changes the default behavior, and can be surprising if the image is run interactively).` With this patch, some (harmless, but possibly confusing) errors are no longer printed during build, for example: ```patch Unpacking libgcc1:armhf (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:armhf. Preparing to unpack .../04-libc6_2.24-11+deb9u4_armhf.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline Unpacking libc6:armhf (2.24-11+deb9u4) ... Selecting previously unselected package libgcc1:arm64. Preparing to unpack .../05-libgcc1_1%3a6.3.0-18+deb9u1_arm64.deb ... Unpacking libgcc1:arm64 (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:arm64. Preparing to unpack .../06-libc6_2.24-11+deb9u4_arm64.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline ``` Looks like some output is now also printed on stdout instead of stderr Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-11 15:08:33 +00:00
ARG DEBIAN_FRONTEND
Dockerfile: use version for some utilities instead of commit-sha The golangci-lint, gotestsum, shfmt, and vndr utilities should generally be ok to be pinned by version instead of a specific sha. Also rename the corresponding env-vars / build-args accordingly: - GOLANGCI_LINT_COMMIT -> GOLANGCI_LINT_VERSION - GOTESTSUM_COMMIT -> GOTESTSUM_VERSION - SHFMT_COMMIT -> SHFMT_VERSION - VNDR_COMMIT -> VNDR_VERSION - CONTAINERD_COMMIT -> CONTAINERD_VERSION - RUNC_COMMIT -> RUNC_VERSION - ROOTLESS_COMMIT -> ROOTLESS_VERSION Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-07-26 12:48:52 +00:00
ARG TINI_VERSION
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,sharing=locked,id=moby-tini-aptlib,target=/var/lib/apt \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,sharing=locked,id=moby-tini-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
cmake \
vim-common
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
COPY /hack/dockerfile/install/install.sh /hack/dockerfile/install/tini.installer /
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
PREFIX=/build /install.sh tini
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
Make CC toolchains available for other targets This cross-compiling other binaries simpler. It would be nice if the cross Makefile target built all the required bins, but at least this is a first step. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-04-16 23:31:49 +00:00
FROM dev-base AS rootlesskit
Dockerfile: use version for some utilities instead of commit-sha The golangci-lint, gotestsum, shfmt, and vndr utilities should generally be ok to be pinned by version instead of a specific sha. Also rename the corresponding env-vars / build-args accordingly: - GOLANGCI_LINT_COMMIT -> GOLANGCI_LINT_VERSION - GOTESTSUM_COMMIT -> GOTESTSUM_VERSION - SHFMT_COMMIT -> SHFMT_VERSION - VNDR_COMMIT -> VNDR_VERSION - CONTAINERD_COMMIT -> CONTAINERD_VERSION - RUNC_COMMIT -> RUNC_VERSION - ROOTLESS_COMMIT -> ROOTLESS_VERSION Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-07-26 12:48:52 +00:00
ARG ROOTLESSKIT_VERSION
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
ARG PREFIX=/build
COPY /hack/dockerfile/install/install.sh /hack/dockerfile/install/rootlesskit.installer /
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,target=/root/.cache/go-build \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,target=/go/pkg/mod \
Dockerfile: move installers into Dockerfile This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-23 11:57:40 +00:00
/install.sh rootlesskit \
&& "${PREFIX}"/rootlesskit --version \
&& "${PREFIX}"/rootlesskit-docker-proxy --help
allow running `dockerd` in an unprivileged user namespace (rootless mode) Please refer to `docs/rootless.md`. TLDR: * Make sure `/etc/subuid` and `/etc/subgid` contain the entry for you * `dockerd-rootless.sh --experimental` * `docker -H unix://$XDG_RUNTIME_DIR/docker.sock run ...` Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-10-15 07:52:53 +00:00
COPY ./contrib/dockerd-rootless.sh /build
add dockerd-rootless-setuptool.sh Usage: `dockerd-rootless-setuptool.sh install --force` . See `--help` for further information. Co-authored-by: Tianon Gravi <admwiggin@gmail.com> Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-05-11 13:12:50 +00:00
COPY ./contrib/dockerd-rootless-setuptool.sh /build
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
Dockerfile: add crun to dev image Signed-off-by: Cory Snider <csnider@mirantis.com>
2022-06-10 21:19:40 +00:00
FROM base AS crun
ARG CRUN_VERSION=1.4.5
RUN --mount=type=cache,sharing=locked,id=moby-crun-aptlib,target=/var/lib/apt \
--mount=type=cache,sharing=locked,id=moby-crun-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
autoconf \
automake \
build-essential \
libcap-dev \
libprotobuf-c-dev \
libseccomp-dev \
libsystemd-dev \
libtool \
libudev-dev \
libyajl-dev \
python3 \
;
RUN --mount=type=tmpfs,target=/tmp/crun-build \
git clone https://github.com/containers/crun.git /tmp/crun-build && \
cd /tmp/crun-build && \
git checkout -q "${CRUN_VERSION}" && \
./autogen.sh && \
./configure --bindir=/build && \
make -j install
Dockerfile: remove hardcoded platforms for vpnkit stage Current Dockerfile downloads vpnkit for both linux/amd64 and linux/arm64 platforms even if target platform does not match. This change will download vpnkit only if target platform matches, otherwise it will just use a dummy scratch stage. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-11-17 23:23:20 +00:00
# vpnkit
# use dummy scratch stage to avoid build to fail for unsupported platforms
FROM scratch AS vpnkit-windows
FROM scratch AS vpnkit-linux-386
FROM scratch AS vpnkit-linux-arm
FROM scratch AS vpnkit-linux-ppc64le
FROM scratch AS vpnkit-linux-riscv64
FROM scratch AS vpnkit-linux-s390x
FROM djs55/vpnkit:${VPNKIT_VERSION} AS vpnkit-linux-amd64
FROM djs55/vpnkit:${VPNKIT_VERSION} AS vpnkit-linux-arm64
FROM vpnkit-linux-${TARGETARCH} AS vpnkit-linux
FROM vpnkit-${TARGETOS} AS vpnkit
Dockerfile: use build-arg for vpnkit Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:46:49 +00:00
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
# TODO: Some of this is only really needed for testing, it would be nice to split this up
integration: use systemd when $DOCKER_SYSTEMD is set Fix #40492 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-10 17:55:16 +00:00
FROM runtime-dev AS dev-systemd-false
Dockerfile: use DEBIAN_FRONTEND=noninteractive Using a build-arg so that we don't have to specify it for each `apt-get install`, and to preserve that the `DEBIAN_FRONTEND` is preserved in the image itself (which changes the default behavior, and can be surprising if the image is run interactively).` With this patch, some (harmless, but possibly confusing) errors are no longer printed during build, for example: ```patch Unpacking libgcc1:armhf (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:armhf. Preparing to unpack .../04-libc6_2.24-11+deb9u4_armhf.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline Unpacking libc6:armhf (2.24-11+deb9u4) ... Selecting previously unselected package libgcc1:arm64. Preparing to unpack .../05-libgcc1_1%3a6.3.0-18+deb9u1_arm64.deb ... Unpacking libgcc1:arm64 (1:6.3.0-18+deb9u1) ... Selecting previously unselected package libc6:arm64. Preparing to unpack .../06-libc6_2.24-11+deb9u4_arm64.deb ... -debconf: unable to initialize frontend: Dialog -debconf: (TERM is not set, so the dialog frontend is not usable.) -debconf: falling back to frontend: Readline ``` Looks like some output is now also printed on stdout instead of stderr Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-08-11 15:08:33 +00:00
ARG DEBIAN_FRONTEND
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
RUN groupadd -r docker
hack: support $DOCKER_ROOTLESS for testing rootless ``` $ DOCKER_EXPERIMENTAL=1 DOCKER_ROOTLESS=1 TEST_SKIP_INTEGRATION_CLI=1 \ make test-integration ``` test-integration-cli is unsupported currently. Also, tests that spawn custom daemon (testutil/daemon) are skipped. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-18 09:43:56 +00:00
RUN useradd --create-home --gid docker unprivilegeduser \
&& mkdir -p /home/unprivilegeduser/.local/share/docker \
&& chown -R unprivilegeduser /home/unprivilegeduser
Re-add support for a custom .bashrc file in build env Signed-off-by: Harald Albers <github@albersweb.de>
2018-06-29 10:39:36 +00:00
# Let us use a .bashrc file
RUN ln -sfv /go/src/github.com/docker/docker/.bashrc ~/.bashrc
Enable bash completion in development container Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-24 21:51:06 +00:00
# Activate bash completion and include Docker's completion if mounted with DOCKER_BASH_COMPLETION_PATH
RUN echo "source /usr/share/bash-completion/bash_completion" >> /etc/bash.bashrc
Add bash completion to the development container Adds an environment variable `DOCKER_BASH_COMPLETION_PATH` that allows to include a bash completion script into the development container. This is needid for development of bash completion. Signed-off-by: Harald Albers <github@albersweb.de>
2017-06-23 16:05:38 +00:00
RUN ln -s /usr/local/completion/bash/docker /etc/bash_completion.d/docker
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
RUN ldconfig
# This should only install packages that are specifically needed for the dev environment and nothing else
# Do you really need to add another package here? Can it be done in a different build stage?
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
RUN --mount=type=cache,sharing=locked,id=moby-dev-aptlib,target=/var/lib/apt \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
--mount=type=cache,sharing=locked,id=moby-dev-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
apparmor \
bash-completion \
Dockerfile: sort packages alphabetically Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:56:32 +00:00
bzip2 \
Dockerfile: update to debian bullseye Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-19 19:16:01 +00:00
inetutils-ping \
iproute2 \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
iptables \
jq \
libcap2-bin \
Dockerfile: sort packages alphabetically Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:56:32 +00:00
libnet1 \
libnl-3-200 \
libprotobuf-c1 \
Dockerfile: add crun to dev image Signed-off-by: Cory Snider <csnider@mirantis.com>
2022-06-10 21:19:40 +00:00
libyajl2 \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
net-tools \
hack/vendor: add check for vendored archive/tar Also allow re-vendoring using `./hack/vendor.sh archive/tar` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-15 11:45:41 +00:00
patch \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
pigz \
python3-pip \
python3-setuptools \
python3-wheel \
hack: support $DOCKER_ROOTLESS for testing rootless ``` $ DOCKER_EXPERIMENTAL=1 DOCKER_ROOTLESS=1 TEST_SKIP_INTEGRATION_CLI=1 \ make test-integration ``` test-integration-cli is unsupported currently. Also, tests that spawn custom daemon (testutil/daemon) are skipped. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-18 09:43:56 +00:00
sudo \
logger/journald: rewrite reader w/o cursors Careful management of the journal read pointer is sufficient to ensure that no entry is read more than once. Unit test the journald logger without requiring a running journald by using the systemd-journal-remote command to write arbitrary entries to journal files. Signed-off-by: Cory Snider <csnider@mirantis.com>
2022-02-02 21:39:35 +00:00
systemd-journal-remote \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
thin-provisioning-tools \
hack: support $DOCKER_ROOTLESS for testing rootless ``` $ DOCKER_EXPERIMENTAL=1 DOCKER_ROOTLESS=1 TEST_SKIP_INTEGRATION_CLI=1 \ make test-integration ``` test-integration-cli is unsupported currently. Also, tests that spawn custom daemon (testutil/daemon) are skipped. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-18 09:43:56 +00:00
uidmap \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
vim \
vim-common \
xfsprogs \
xz-utils \
compression: add support for the zstd algorithm zstd is a compression algorithm that has a very fast decoder, while providing also good compression ratios. The fast decoder makes it suitable for container images, as decompressing the tarballs is a very expensive operation. https://github.com/opencontainers/image-spec/pull/788 added support for zstd to the OCI image specs. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2020-12-08 09:56:32 +00:00
zip \
zstd
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
Dockerfile: add back yamllint This was inadvertedly removed in 7bfe48cc00318f9d4cf388237855012aafac56b0, because it was documented as a dependency for docker-py, but actually used to validate the swagger file. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-30 23:59:02 +00:00
Add a TODO in the Dockerfile regarding nftables Someday, we'll hopefully support nftables directly and will likely then need some kind of in-container runtime detection (perhaps based on loaded modules or something similar). This updates the related `Dockerfile` comment accordingly (linking to the appropriate `nftables` tracking issue). Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
2020-02-25 23:31:07 +00:00
# Switch to use iptables instead of nftables (to match the CI hosts)
# TODO use some kind of runtime auto-detection instead if/when nftables is supported (https://github.com/moby/moby/issues/26824)
Dockerfile: switch to iptables-legacy to match the host CI runs on Ubuntu 16.04 machines, which use iptables (legacy), but Debian buster uses nftables. Because of this, DNS resolution does not work if the daemon configures iptables. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-22 15:22:13 +00:00
RUN update-alternatives --set iptables /usr/sbin/iptables-legacy || true \
&& update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy || true \
&& update-alternatives --set arptables /usr/sbin/arptables-legacy || true
Dockerfile: update yamllint to v1.27.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2022-08-26 07:21:29 +00:00
ARG YAMLLINT_VERSION=1.27.1
RUN pip3 install yamllint==${YAMLLINT_VERSION}
Dockerfile: add back yamllint This was inadvertedly removed in 7bfe48cc00318f9d4cf388237855012aafac56b0, because it was documented as a dependency for docker-py, but actually used to validate the swagger file. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-07-30 23:59:02 +00:00
Dockerfile: align consecutive COPY lines Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 21:10:32 +00:00
COPY --from=dockercli /build/ /usr/local/cli
Standardize artefact path for all build stages Update all build stages to output artefacts to /build Signed-off-by: Jeff Hajewski <jeff.hajewski@gmail.com>
2018-04-13 18:45:57 +00:00
COPY --from=frozen-images /build/ /docker-frozen-images
Dockerfile: align consecutive COPY lines Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 21:10:32 +00:00
COPY --from=swagger /build/ /usr/local/bin/
Added Delve debugger to the development container (including instructions in the contribution guide). Signed-off-by: Konrad Ponichtera <konpon96@gmail.com>
2022-02-20 18:21:10 +00:00
COPY --from=delve /build/ /usr/local/bin/
validate/toml: switch to github.com/pelletier/go-toml The github.com/BurntSushi/toml project is no longer maintained, and containerd is switching to this project instead, so start moving our code as well. This patch only changes the binary used during validation (tbh, we could probably remove this validation step, but leaving that for now). I manually verified that the hack/verify/toml still works by adding a commit that makes the MAINTAINERS file invalid; diff --git a/MAINTAINERS b/MAINTAINERS index b739e7e20c..81ababd8de 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -23,7 +23,7 @@ # a subsystem, they are responsible for doing so and holding the # subsystem maintainers accountable. If ownership is unclear, they are the de facto owners. - people = [ + people = "akihirosuda", "anusha", "coolljt0725", Running `hack/verify/toml` was able to detect the broken format; hack/validate/toml (27, 4): keys cannot contain , characterThese files are not valid TOML: - MAINTAINERS Please reformat the above files as valid TOML Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-02 14:02:34 +00:00
COPY --from=tomll /build/ /usr/local/bin/
use go-winres for cross to create Windows resources Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-04-14 17:52:23 +00:00
COPY --from=gowinres /build/ /usr/local/bin/
Dockerfile: align consecutive COPY lines Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 21:10:32 +00:00
COPY --from=tini /build/ /usr/local/bin/
COPY --from=registry /build/ /usr/local/bin/
Dockerfile: install criu from binary repo Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-12-02 01:02:42 +00:00
COPY --from=criu /build/ /usr/local/bin/
Dockerfile: align consecutive COPY lines Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 21:10:32 +00:00
COPY --from=gotestsum /build/ /usr/local/bin/
Dockerfile: order COPY lines by change frequency Ordering the COPY lines to optimize for layer sharing when these dependencies are updated. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:59:51 +00:00
COPY --from=golangci_lint /build/ /usr/local/bin/
validate: add shfmt Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-29 15:31:43 +00:00
COPY --from=shfmt /build/ /usr/local/bin/
Dockerfile: align consecutive COPY lines Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 21:10:32 +00:00
COPY --from=runc /build/ /usr/local/bin/
COPY --from=containerd /build/ /usr/local/bin/
COPY --from=rootlesskit /build/ /usr/local/bin/
Dockerfile: remove hardcoded platforms for vpnkit stage Current Dockerfile downloads vpnkit for both linux/amd64 and linux/arm64 platforms even if target platform does not match. This change will download vpnkit only if target platform matches, otherwise it will just use a dummy scratch stage. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-11-17 23:23:20 +00:00
COPY --from=vpnkit / /usr/local/bin/
Dockerfile: add crun to dev image Signed-off-by: Cory Snider <csnider@mirantis.com>
2022-06-10 21:19:40 +00:00
COPY --from=crun /build/ /usr/local/bin/
COPY hack/dockerfile/etc/docker/ /etc/docker/
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
ENV PATH=/usr/local/cli:$PATH
binary targets do not need the dev environment This makes the binary build targets use a minimal build env instead of having to build all the stuff needed for the full dev enviornment. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 20:11:49 +00:00
ARG DOCKER_BUILDTAGS
ENV DOCKER_BUILDTAGS="${DOCKER_BUILDTAGS}"
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
WORKDIR /go/src/github.com/docker/docker
VOLUME /var/lib/docker
hack: support $DOCKER_ROOTLESS for testing rootless ``` $ DOCKER_EXPERIMENTAL=1 DOCKER_ROOTLESS=1 TEST_SKIP_INTEGRATION_CLI=1 \ make test-integration ``` test-integration-cli is unsupported currently. Also, tests that spawn custom daemon (testutil/daemon) are skipped. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-18 09:43:56 +00:00
VOLUME /home/unprivilegeduser/.local/share/docker
Updates the Dockerfile to use multi-stage Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-09-29 21:09:14 +00:00
# Wrap all commands in the "docker-in-docker" script to allow nested containers
ENTRYPOINT ["hack/dind"]
Fix trick for `make BINDDIR=. shell` and `COPY .` This was inadvertently removed when updating the Dockerfile for buildkit specific features. Trick selects a different build target depending on if the source is going to be bind-mounted in anyway, which prevents the need to copy the whole source tree to the builder. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-10-08 18:17:15 +00:00
integration: use systemd when $DOCKER_SYSTEMD is set Fix #40492 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-02-10 17:55:16 +00:00
FROM dev-systemd-false AS dev-systemd-true
RUN --mount=type=cache,sharing=locked,id=moby-dev-aptlib,target=/var/lib/apt \
--mount=type=cache,sharing=locked,id=moby-dev-aptcache,target=/var/cache/apt \
apt-get update && apt-get install -y --no-install-recommends \
dbus \
dbus-user-session \
systemd \
systemd-sysv
ENTRYPOINT ["hack/dind-systemd"]
Fix `make shell` a3292263a3cb29c972b41511aeb0a3e36c8468c7 broke `make shell` which is trying to build the `dev` Dockerfile stage which no longer exists after the change. This adds the stage back. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-03-06 06:36:54 +00:00
FROM dev-systemd-${SYSTEMD} AS dev
Bind-mount context for Dockerfile build targets Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 21:41:04 +00:00
FROM runtime-dev AS binary-base
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
ARG DOCKER_GITCOMMIT=HEAD
Pass VERSION variable to binary build targets. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-10-16 17:09:10 +00:00
ENV DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT}
ARG VERSION
ENV VERSION=${VERSION}
ARG PLATFORM
ENV PLATFORM=${PLATFORM}
ARG PRODUCT
ENV PRODUCT=${PRODUCT}
ARG DEFAULT_PRODUCT_LICENSE
ENV DEFAULT_PRODUCT_LICENSE=${DEFAULT_PRODUCT_LICENSE}
use go-winres for cross to create Windows resources Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-04-14 17:52:23 +00:00
ARG PACKAGER_NAME
ENV PACKAGER_NAME=${PACKAGER_NAME}
binary targets do not need the dev environment This makes the binary build targets use a minimal build env instead of having to build all the stuff needed for the full dev enviornment. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 20:11:49 +00:00
ARG DOCKER_BUILDTAGS
ENV DOCKER_BUILDTAGS="${DOCKER_BUILDTAGS}"
Bind-mount context for Dockerfile build targets Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 21:41:04 +00:00
ENV PREFIX=/build
binary targets do not need the dev environment This makes the binary build targets use a minimal build env instead of having to build all the stuff needed for the full dev enviornment. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 20:11:49 +00:00
# TODO: This is here because hack/make.sh binary copies these extras binaries
# from $PATH into the bundles dir.
# It would be nice to handle this in a different way.
use go-winres for cross to create Windows resources Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-04-14 17:52:23 +00:00
COPY --from=tini /build/ /usr/local/bin/
COPY --from=runc /build/ /usr/local/bin/
COPY --from=containerd /build/ /usr/local/bin/
COPY --from=rootlesskit /build/ /usr/local/bin/
Dockerfile: remove hardcoded platforms for vpnkit stage Current Dockerfile downloads vpnkit for both linux/amd64 and linux/arm64 platforms even if target platform does not match. This change will download vpnkit only if target platform matches, otherwise it will just use a dummy scratch stage. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-11-17 23:23:20 +00:00
COPY --from=vpnkit / /usr/local/bin/
use go-winres for cross to create Windows resources Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-04-14 17:52:23 +00:00
COPY --from=gowinres /build/ /usr/local/bin/
Bind-mount context for Dockerfile build targets Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 21:41:04 +00:00
WORKDIR /go/src/github.com/docker/docker
Pass VERSION variable to binary build targets. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-10-16 17:09:10 +00:00
FROM binary-base AS build-binary
use go-winres for cross to create Windows resources Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-04-14 17:52:23 +00:00
RUN --mount=type=cache,target=/root/.cache \
--mount=type=bind,target=.,ro \
--mount=type=tmpfs,target=cli/winresources/dockerd \
--mount=type=tmpfs,target=cli/winresources/docker-proxy \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
hack/make.sh binary
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
Pass VERSION variable to binary build targets. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-10-16 17:09:10 +00:00
FROM binary-base AS build-dynbinary
use go-winres for cross to create Windows resources Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-04-14 17:52:23 +00:00
RUN --mount=type=cache,target=/root/.cache \
--mount=type=bind,target=.,ro \
--mount=type=tmpfs,target=cli/winresources/dockerd \
--mount=type=tmpfs,target=cli/winresources/docker-proxy \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
hack/make.sh dynbinary
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
Pass VERSION variable to binary build targets. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-10-16 17:09:10 +00:00
FROM binary-base AS build-cross
ARG DOCKER_CROSSPLATFORMS
use go-winres for cross to create Windows resources Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2022-04-14 17:52:23 +00:00
RUN --mount=type=cache,target=/root/.cache \
--mount=type=bind,target=.,ro \
--mount=type=tmpfs,target=cli/winresources/dockerd \
--mount=type=tmpfs,target=cli/winresources/docker-proxy \
Dockerfile: use spaces for indentation Indenting with tabs can cause the formatting to go wonky, because the first line of any command is "indented" with spaces, but following lines are not, therefore they can be mis-aligned with the first line. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-05 20:41:27 +00:00
hack/make.sh cross
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
FROM scratch AS binary
Bind-mount context for Dockerfile build targets Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 21:41:04 +00:00
COPY --from=build-binary /build/bundles/ /
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
FROM scratch AS dynbinary
Fix output targets getting double nested. Targets are going to bundles/bundles instead of just bundles/. This is because there is `bundles` in the actual built binaries as well as the output dir being set to bundles. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-12-30 21:20:11 +00:00
COPY --from=build-dynbinary /build/bundles/ /
Buildkit-optimized dockerfile Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-05-22 23:49:55 +00:00
FROM scratch AS cross
Fix output targets getting double nested. Targets are going to bundles/bundles instead of just bundles/. This is because there is `bundles` in the actual built binaries as well as the output dir being set to bundles. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-12-30 21:20:11 +00:00
COPY --from=build-cross /build/bundles/ /
Use BuildKit to skip source code COPY if BIND_DIR set build the final stage of the Dockerfile (including COPY ...) if no BIND_DIR is used. if BIND_DIR is used, build the dev stage, thus skipping the COPY. Original author: @thaJeztah Signed-off-by: Mohammad Nasirifar <farnasirim@gmail.com>
2018-12-14 01:26:10 +00:00
Fix `make shell` a3292263a3cb29c972b41511aeb0a3e36c8468c7 broke `make shell` which is trying to build the `dev` Dockerfile stage which no longer exists after the change. This adds the stage back. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-03-06 06:36:54 +00:00
FROM dev AS final
Bind-mount context for Dockerfile build targets Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-11-05 21:41:04 +00:00
COPY . /go/src/github.com/docker/docker
Reference in a new issue Copy permalink