Browse code
Upgrade the frozen images to multi-arch
Upgrade the frozen images to the multi-arch ones.
Since issue #35963 is not fixed yet on linux/amd64, so we keep the busybox
image on amd64 untouched.
Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Dennis Chen authored on 2018/01/05 11:58:14Showing 5 changed files
| ... | ... |
@@ -167,11 +167,12 @@ RUN echo "source $PWD/hack/make/.integration-test-helpers" >> /etc/bash.bashrc |
| 167 | 167 |
|
| 168 | 168 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
| 169 | 169 |
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
| 170 |
+# TODO: when issue #35963 fixed, we can upgrade the busybox to multi-arch |
|
| 170 | 171 |
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 171 |
- buildpack-deps:jessie@sha256:85b379ec16065e4fe4127eb1c5fb1bcc03c559bd36dbb2e22ff496de55925fa6 \ |
|
| 172 |
+ buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ |
|
| 172 | 173 |
busybox:latest@sha256:32f093055929dbc23dec4d03e09dfe971f5973a9ca5cf059cbfb644c206aa83f \ |
| 173 |
- debian:jessie@sha256:72f784399fd2719b4cb4e16ef8e369a39dc67f53d978cd3e2e7bf4e502c7b793 \ |
|
| 174 |
- hello-world:latest@sha256:c5515758d4c5e1e838e9cd307f6c6a0d620b5e07e6f927b07d05f6d12a1ac8d7 |
|
| 174 |
+ debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \ |
|
| 175 |
+ hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c |
|
| 175 | 176 |
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
| 176 | 177 |
|
| 177 | 178 |
# Install tomlv, vndr, runc, containerd, tini, docker-proxy dockercli |
| ... | ... |
@@ -131,10 +131,10 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker |
| 131 | 131 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
| 132 | 132 |
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
| 133 | 133 |
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 134 |
- armhf/buildpack-deps:jessie@sha256:eb2dad77ef53e88d94c3c83862d315c806ea1ca49b6e74f4db362381365ce489 \ |
|
| 135 |
- armhf/busybox:latest@sha256:016a1e149d2acc2a3789a160dfa60ce870794eea27ad5e96f7a101970e5e1689 \ |
|
| 136 |
- armhf/debian:jessie@sha256:ac59fa18b28d0ef751eabb5ba4c4b5a9063f99398bae2f70495aa8ed6139b577 \ |
|
| 137 |
- armhf/hello-world:latest@sha256:9701edc932223a66e49dd6c894a11db8c2cf4eccd1414f1ec105a623bf16b426 |
|
| 134 |
+ buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ |
|
| 135 |
+ busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \ |
|
| 136 |
+ debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \ |
|
| 137 |
+ hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c |
|
| 138 | 138 |
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
| 139 | 139 |
|
| 140 | 140 |
# Install tomlv, vndr, runc, containerd, tini, docker-proxy |
| ... | ... |
@@ -16,10 +16,10 @@ WORKDIR /go/src/github.com/docker/docker/ |
| 16 | 16 |
# Generate frozen images |
| 17 | 17 |
COPY contrib/download-frozen-image-v2.sh contrib/download-frozen-image-v2.sh |
| 18 | 18 |
RUN contrib/download-frozen-image-v2.sh /output/docker-frozen-images \ |
| 19 |
- buildpack-deps:jessie@sha256:85b379ec16065e4fe4127eb1c5fb1bcc03c559bd36dbb2e22ff496de55925fa6 \ |
|
| 20 |
- busybox:latest@sha256:32f093055929dbc23dec4d03e09dfe971f5973a9ca5cf059cbfb644c206aa83f \ |
|
| 21 |
- debian:jessie@sha256:72f784399fd2719b4cb4e16ef8e369a39dc67f53d978cd3e2e7bf4e502c7b793 \ |
|
| 22 |
- hello-world:latest@sha256:c5515758d4c5e1e838e9cd307f6c6a0d620b5e07e6f927b07d05f6d12a1ac8d7 |
|
| 19 |
+ buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ |
|
| 20 |
+ busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \ |
|
| 21 |
+ debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \ |
|
| 22 |
+ hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c |
|
| 23 | 23 |
|
| 24 | 24 |
# Download Docker CLI binary |
| 25 | 25 |
COPY hack/dockerfile hack/dockerfile |
| ... | ... |
@@ -129,10 +129,10 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker |
| 129 | 129 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
| 130 | 130 |
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
| 131 | 131 |
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 132 |
- ppc64le/buildpack-deps:jessie@sha256:1a2f2d2cc8738f14b336aeffc3503b5c9dedf9e1f26c7313cb4999534ad4716f \ |
|
| 133 |
- ppc64le/busybox:latest@sha256:54f34c83adfab20cf0e630d879e210f07b0062cd6caaf16346a61396d50e7584 \ |
|
| 134 |
- ppc64le/debian:jessie@sha256:ea8c5b105e3790f075145b40e4be1e4488c9f33f55e6cc45182047b80a68f892 \ |
|
| 135 |
- ppc64le/hello-world:latest@sha256:7d57adf137665f748956c86089320710b66d08584db3500ed98f4bb3da637c2d |
|
| 132 |
+ buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ |
|
| 133 |
+ busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \ |
|
| 134 |
+ debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \ |
|
| 135 |
+ hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c |
|
| 136 | 136 |
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
| 137 | 137 |
|
| 138 | 138 |
# Install tomlv, vndr, runc, containerd, tini, docker-proxy |
| ... | ... |
@@ -123,10 +123,10 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker |
| 123 | 123 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
| 124 | 124 |
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
| 125 | 125 |
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 126 |
- s390x/buildpack-deps:jessie@sha256:552dec28146e4d2591fc0309aebdbac9e4fb1f335d90c70a14bbf72fb8bb1be5 \ |
|
| 127 |
- s390x/busybox:latest@sha256:e32f40c39ca596a4317392bd32809bb188c4ae5864ea827c3219c75c50069964 \ |
|
| 128 |
- s390x/debian:jessie@sha256:6994e3ffa5a1dabea09d536f350b3ed2715292cb469417c42a82b70fcbff7d32 \ |
|
| 129 |
- s390x/hello-world:latest@sha256:602db500fee63934292260e65c0c528128ad1c1c7c6497f95bbbac7d4d5312f1 |
|
| 126 |
+ buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \ |
|
| 127 |
+ busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \ |
|
| 128 |
+ debian:jessie@sha256:287a20c5f73087ab406e6b364833e3fb7b3ae63ca0eb3486555dc27ed32c6e60 \ |
|
| 129 |
+ hello-world:latest@sha256:be0cd392e45be79ffeffa6b05338b98ebb16c87b255f48e297ec7f98e123905c |
|
| 130 | 130 |
# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
| 131 | 131 |
|
| 132 | 132 |
# Install tomlv, vndr, runc, containerd, tini, docker-proxy |