Browse code
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>
(cherry picked from commit a42b4144bce728590d7c01aa2401589e71850518)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2019/10/06 05:41:27Showing 1 changed files
| ... | ... |
@@ -39,23 +39,23 @@ FROM base AS criu |
| 39 | 39 |
ARG DEBIAN_FRONTEND |
| 40 | 40 |
# Install dependency packages specific to criu |
| 41 | 41 |
RUN apt-get update && apt-get install -y --no-install-recommends \ |
| 42 |
- libnet-dev \ |
|
| 43 |
- libprotobuf-c-dev \ |
|
| 44 |
- libprotobuf-dev \ |
|
| 45 |
- libnl-3-dev \ |
|
| 46 |
- libcap-dev \ |
|
| 47 |
- protobuf-compiler \ |
|
| 48 |
- protobuf-c-compiler \ |
|
| 49 |
- python-protobuf \ |
|
| 50 |
- && rm -rf /var/lib/apt/lists/* |
|
| 42 |
+ libnet-dev \ |
|
| 43 |
+ libprotobuf-c-dev \ |
|
| 44 |
+ libprotobuf-dev \ |
|
| 45 |
+ libnl-3-dev \ |
|
| 46 |
+ libcap-dev \ |
|
| 47 |
+ protobuf-compiler \ |
|
| 48 |
+ protobuf-c-compiler \ |
|
| 49 |
+ python-protobuf \ |
|
| 50 |
+ && rm -rf /var/lib/apt/lists/* |
|
| 51 | 51 |
|
| 52 | 52 |
# Install CRIU for checkpoint/restore support |
| 53 | 53 |
ENV CRIU_VERSION 3.12 |
| 54 | 54 |
RUN mkdir -p /usr/src/criu \ |
| 55 |
- && curl -sSL https://github.com/checkpoint-restore/criu/archive/v${CRIU_VERSION}.tar.gz | tar -C /usr/src/criu/ -xz --strip-components=1 \
|
|
| 56 |
- && cd /usr/src/criu \ |
|
| 57 |
- && make \ |
|
| 58 |
- && make PREFIX=/build/ install-criu |
|
| 55 |
+ && curl -sSL https://github.com/checkpoint-restore/criu/archive/v${CRIU_VERSION}.tar.gz | tar -C /usr/src/criu/ -xz --strip-components=1 \
|
|
| 56 |
+ && cd /usr/src/criu \ |
|
| 57 |
+ && make \ |
|
| 58 |
+ && make PREFIX=/build/ install-criu |
|
| 59 | 59 |
|
| 60 | 60 |
FROM base AS registry |
| 61 | 61 |
# Install two versions of the registry. The first is an older version that |
| ... | ... |
@@ -65,19 +65,19 @@ FROM base AS registry |
| 65 | 65 |
ENV REGISTRY_COMMIT_SCHEMA1 ec87e9b6971d831f0eff752ddb54fb64693e51cd |
| 66 | 66 |
ENV REGISTRY_COMMIT 47a064d4195a9b56133891bbb13620c3ac83a827 |
| 67 | 67 |
RUN set -x \ |
| 68 |
- && export GOPATH="$(mktemp -d)" \ |
|
| 69 |
- && git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \ |
|
| 70 |
- && (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \ |
|
| 71 |
- && GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \ |
|
| 72 |
- go build -buildmode=pie -o /build/registry-v2 github.com/docker/distribution/cmd/registry \ |
|
| 73 |
- && case $(dpkg --print-architecture) in \ |
|
| 74 |
- amd64|ppc64*|s390x) \ |
|
| 75 |
- (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1"); \ |
|
| 76 |
- GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH"; \ |
|
| 77 |
- go build -buildmode=pie -o /build/registry-v2-schema1 github.com/docker/distribution/cmd/registry; \ |
|
| 78 |
- ;; \ |
|
| 79 |
- esac \ |
|
| 80 |
- && rm -rf "$GOPATH" |
|
| 68 |
+ && export GOPATH="$(mktemp -d)" \ |
|
| 69 |
+ && git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \ |
|
| 70 |
+ && (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \ |
|
| 71 |
+ && GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \ |
|
| 72 |
+ go build -buildmode=pie -o /build/registry-v2 github.com/docker/distribution/cmd/registry \ |
|
| 73 |
+ && case $(dpkg --print-architecture) in \ |
|
| 74 |
+ amd64|ppc64*|s390x) \ |
|
| 75 |
+ (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1"); \ |
|
| 76 |
+ GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH"; \ |
|
| 77 |
+ go build -buildmode=pie -o /build/registry-v2-schema1 github.com/docker/distribution/cmd/registry; \ |
|
| 78 |
+ ;; \ |
|
| 79 |
+ esac \ |
|
| 80 |
+ && rm -rf "$GOPATH" |
|
| 81 | 81 |
|
| 82 | 82 |
FROM base AS swagger |
| 83 | 83 |
# Install go-swagger for validating swagger.yaml |
| ... | ... |
@@ -85,26 +85,26 @@ FROM base AS swagger |
| 85 | 85 |
# TODO: move to under moby/ or fix upstream go-swagger to work for us. |
| 86 | 86 |
ENV GO_SWAGGER_COMMIT 5793aa66d4b4112c2602c716516e24710e4adbb5 |
| 87 | 87 |
RUN set -x \ |
| 88 |
- && export GOPATH="$(mktemp -d)" \ |
|
| 89 |
- && git clone https://github.com/kolyshkin/go-swagger.git "$GOPATH/src/github.com/go-swagger/go-swagger" \ |
|
| 90 |
- && (cd "$GOPATH/src/github.com/go-swagger/go-swagger" && git checkout -q "$GO_SWAGGER_COMMIT") \ |
|
| 91 |
- && go build -o /build/swagger github.com/go-swagger/go-swagger/cmd/swagger \ |
|
| 92 |
- && rm -rf "$GOPATH" |
|
| 88 |
+ && export GOPATH="$(mktemp -d)" \ |
|
| 89 |
+ && git clone https://github.com/kolyshkin/go-swagger.git "$GOPATH/src/github.com/go-swagger/go-swagger" \ |
|
| 90 |
+ && (cd "$GOPATH/src/github.com/go-swagger/go-swagger" && git checkout -q "$GO_SWAGGER_COMMIT") \ |
|
| 91 |
+ && go build -o /build/swagger github.com/go-swagger/go-swagger/cmd/swagger \ |
|
| 92 |
+ && rm -rf "$GOPATH" |
|
| 93 | 93 |
|
| 94 | 94 |
FROM base AS frozen-images |
| 95 | 95 |
ARG DEBIAN_FRONTEND |
| 96 | 96 |
RUN apt-get update && apt-get install -y --no-install-recommends \ |
| 97 |
- ca-certificates \ |
|
| 98 |
- jq \ |
|
| 99 |
- && rm -rf /var/lib/apt/lists/* |
|
| 97 |
+ ca-certificates \ |
|
| 98 |
+ jq \ |
|
| 99 |
+ && rm -rf /var/lib/apt/lists/* |
|
| 100 | 100 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
| 101 | 101 |
COPY contrib/download-frozen-image-v2.sh / |
| 102 | 102 |
RUN /download-frozen-image-v2.sh /build \ |
| 103 |
- buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ |
|
| 104 |
- busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \ |
|
| 105 |
- busybox:glibc@sha256:0b55a30394294ab23b9afd58fab94e61a923f5834fba7ddbae7f8e0c11ba85e6 \ |
|
| 106 |
- debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \ |
|
| 107 |
- hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c |
|
| 103 |
+ buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ |
|
| 104 |
+ busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \ |
|
| 105 |
+ busybox:glibc@sha256:0b55a30394294ab23b9afd58fab94e61a923f5834fba7ddbae7f8e0c11ba85e6 \ |
|
| 106 |
+ debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \ |
|
| 107 |
+ hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c |
|
| 108 | 108 |
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
| 109 | 109 |
|
| 110 | 110 |
FROM base AS cross-false |
| ... | ... |
@@ -115,21 +115,22 @@ RUN dpkg --add-architecture armhf |
| 115 | 115 |
RUN dpkg --add-architecture arm64 |
| 116 | 116 |
RUN dpkg --add-architecture armel |
| 117 | 117 |
RUN if [ "$(go env GOHOSTARCH)" = "amd64" ]; then \ |
| 118 |
- apt-get update && apt-get install -y --no-install-recommends \ |
|
| 119 |
- crossbuild-essential-armhf \ |
|
| 120 |
- crossbuild-essential-arm64 \ |
|
| 121 |
- crossbuild-essential-armel \ |
|
| 122 |
- && rm -rf /var/lib/apt/lists/*; \ |
|
| 123 |
- fi |
|
| 118 |
+ apt-get update && apt-get install -y --no-install-recommends \ |
|
| 119 |
+ crossbuild-essential-armhf \ |
|
| 120 |
+ crossbuild-essential-arm64 \ |
|
| 121 |
+ crossbuild-essential-armel \ |
|
| 122 |
+ && rm -rf /var/lib/apt/lists/*; \ |
|
| 123 |
+ fi |
|
| 124 | 124 |
|
| 125 | 125 |
FROM cross-${CROSS} as dev-base
|
| 126 | 126 |
|
| 127 | 127 |
FROM dev-base AS runtime-dev-cross-false |
| 128 | 128 |
ARG DEBIAN_FRONTEND |
| 129 | 129 |
RUN apt-get update && apt-get install -y --no-install-recommends \ |
| 130 |
- libapparmor-dev \ |
|
| 131 |
- libseccomp-dev \ |
|
| 132 |
- && rm -rf /var/lib/apt/lists/* |
|
| 130 |
+ libapparmor-dev \ |
|
| 131 |
+ libseccomp-dev \ |
|
| 132 |
+ && rm -rf /var/lib/apt/lists/* |
|
| 133 |
+ |
|
| 133 | 134 |
FROM cross-true AS runtime-dev-cross-true |
| 134 | 135 |
ARG DEBIAN_FRONTEND |
| 135 | 136 |
# These crossbuild packages rely on gcc-<arch>, but this doesn't want to install |
| ... | ... |
@@ -137,19 +138,19 @@ ARG DEBIAN_FRONTEND |
| 137 | 137 |
# Additionally, the crossbuild-amd64 is currently only on debian:buster, so |
| 138 | 138 |
# other architectures cannnot crossbuild amd64. |
| 139 | 139 |
RUN if [ "$(go env GOHOSTARCH)" = "amd64" ]; then \ |
| 140 |
- apt-get update && apt-get install -y --no-install-recommends \ |
|
| 141 |
- libseccomp-dev:armhf \ |
|
| 142 |
- libseccomp-dev:arm64 \ |
|
| 143 |
- libseccomp-dev:armel \ |
|
| 144 |
- libapparmor-dev:armhf \ |
|
| 145 |
- libapparmor-dev:arm64 \ |
|
| 146 |
- libapparmor-dev:armel \ |
|
| 147 |
- # install this arches seccomp here due to compat issues with the v0 builder |
|
| 148 |
- # This is as opposed to inheriting from runtime-dev-cross-false |
|
| 149 |
- libapparmor-dev \ |
|
| 150 |
- libseccomp-dev \ |
|
| 151 |
- && rm -rf /var/lib/apt/lists/*; \ |
|
| 152 |
- fi |
|
| 140 |
+ apt-get update && apt-get install -y --no-install-recommends \ |
|
| 141 |
+ libseccomp-dev:armhf \ |
|
| 142 |
+ libseccomp-dev:arm64 \ |
|
| 143 |
+ libseccomp-dev:armel \ |
|
| 144 |
+ libapparmor-dev:armhf \ |
|
| 145 |
+ libapparmor-dev:arm64 \ |
|
| 146 |
+ libapparmor-dev:armel \ |
|
| 147 |
+ # install this arches seccomp here due to compat issues with the v0 builder |
|
| 148 |
+ # This is as opposed to inheriting from runtime-dev-cross-false |
|
| 149 |
+ libapparmor-dev \ |
|
| 150 |
+ libseccomp-dev \ |
|
| 151 |
+ && rm -rf /var/lib/apt/lists/*; \ |
|
| 152 |
+ fi |
|
| 153 | 153 |
|
| 154 | 154 |
FROM runtime-dev-cross-${CROSS} AS runtime-dev
|
| 155 | 155 |
|
| ... | ... |
@@ -171,8 +172,8 @@ FROM dev-base AS containerd |
| 171 | 171 |
ARG DEBIAN_FRONTEND |
| 172 | 172 |
ARG CONTAINERD_COMMIT |
| 173 | 173 |
RUN apt-get update && apt-get install -y --no-install-recommends \ |
| 174 |
- btrfs-tools \ |
|
| 175 |
- && rm -rf /var/lib/apt/lists/* |
|
| 174 |
+ btrfs-tools \ |
|
| 175 |
+ && rm -rf /var/lib/apt/lists/* |
|
| 176 | 176 |
ENV INSTALL_BINARY_NAME=containerd |
| 177 | 177 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 178 | 178 |
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
| ... | ... |
@@ -218,9 +219,9 @@ FROM dev-base AS tini |
| 218 | 218 |
ARG DEBIAN_FRONTEND |
| 219 | 219 |
ARG TINI_COMMIT |
| 220 | 220 |
RUN apt-get update && apt-get install -y --no-install-recommends \ |
| 221 |
- cmake \ |
|
| 222 |
- vim-common \ |
|
| 223 |
- && rm -rf /var/lib/apt/lists/* |
|
| 221 |
+ cmake \ |
|
| 222 |
+ vim-common \ |
|
| 223 |
+ && rm -rf /var/lib/apt/lists/* |
|
| 224 | 224 |
COPY hack/dockerfile/install/install.sh ./install.sh |
| 225 | 225 |
ENV INSTALL_BINARY_NAME=tini |
| 226 | 226 |
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ |
| ... | ... |
@@ -248,34 +249,34 @@ RUN ldconfig |
| 248 | 248 |
# This should only install packages that are specifically needed for the dev environment and nothing else |
| 249 | 249 |
# Do you really need to add another package here? Can it be done in a different build stage? |
| 250 | 250 |
RUN apt-get update && apt-get install -y --no-install-recommends \ |
| 251 |
- apparmor \ |
|
| 252 |
- aufs-tools \ |
|
| 253 |
- bash-completion \ |
|
| 254 |
- btrfs-tools \ |
|
| 255 |
- iptables \ |
|
| 256 |
- jq \ |
|
| 257 |
- libcap2-bin \ |
|
| 258 |
- libdevmapper-dev \ |
|
| 259 |
- libudev-dev \ |
|
| 260 |
- libsystemd-dev \ |
|
| 261 |
- binutils-mingw-w64 \ |
|
| 262 |
- g++-mingw-w64-x86-64 \ |
|
| 263 |
- net-tools \ |
|
| 264 |
- pigz \ |
|
| 265 |
- python3-pip \ |
|
| 266 |
- python3-setuptools \ |
|
| 267 |
- python3-wheel \ |
|
| 268 |
- thin-provisioning-tools \ |
|
| 269 |
- vim \ |
|
| 270 |
- vim-common \ |
|
| 271 |
- xfsprogs \ |
|
| 272 |
- zip \ |
|
| 273 |
- bzip2 \ |
|
| 274 |
- xz-utils \ |
|
| 275 |
- libprotobuf-c1 \ |
|
| 276 |
- libnet1 \ |
|
| 277 |
- libnl-3-200 \ |
|
| 278 |
- && rm -rf /var/lib/apt/lists/* |
|
| 251 |
+ apparmor \ |
|
| 252 |
+ aufs-tools \ |
|
| 253 |
+ bash-completion \ |
|
| 254 |
+ btrfs-tools \ |
|
| 255 |
+ iptables \ |
|
| 256 |
+ jq \ |
|
| 257 |
+ libcap2-bin \ |
|
| 258 |
+ libdevmapper-dev \ |
|
| 259 |
+ libudev-dev \ |
|
| 260 |
+ libsystemd-dev \ |
|
| 261 |
+ binutils-mingw-w64 \ |
|
| 262 |
+ g++-mingw-w64-x86-64 \ |
|
| 263 |
+ net-tools \ |
|
| 264 |
+ pigz \ |
|
| 265 |
+ python3-pip \ |
|
| 266 |
+ python3-setuptools \ |
|
| 267 |
+ python3-wheel \ |
|
| 268 |
+ thin-provisioning-tools \ |
|
| 269 |
+ vim \ |
|
| 270 |
+ vim-common \ |
|
| 271 |
+ xfsprogs \ |
|
| 272 |
+ zip \ |
|
| 273 |
+ bzip2 \ |
|
| 274 |
+ xz-utils \ |
|
| 275 |
+ libprotobuf-c1 \ |
|
| 276 |
+ libnet1 \ |
|
| 277 |
+ libnl-3-200 \ |
|
| 278 |
+ && rm -rf /var/lib/apt/lists/* |
|
| 279 | 279 |
|
| 280 | 280 |
RUN pip3 install yamllint==1.16.0 |
| 281 | 281 |
|