Browse code
Update frozen images in Dockerfiles
This updates the versions of the frozen images used to their current
version. The original reason for updating these images was to make sure
they are not affected by [CVE-2016-1252 / DSA-3733-1](https://lwn.net/Articles/709119/),
which is fixed in apt 1.0.9.8.4 and up.
Note that `CVE-2016-1252` won't affect our test-suite, because no packages
are installed during out tests. It is just "good practice" to keep these
images up to date.
The `debian:jessie`, and `buildpack-deps:jessie` in `Dockerfile.s390x`,
and `Dockerfile.armhf` have not been updated in this patch, because
those images have not yet been updated to contain apt 1.0.9.8.4.
While working on this, the `busybox` and `hello-world` were also updated
to their latest version.
Also removes a reference to `hack/make/.ensure-frozen-images`, which
was removed in ff91276d1f5beab5582d9ca582ee01af13198333.
The new busybox image has one layer less than the original,
so updated `TestBuildSquashParent` to take that into account.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2017/01/01 04:11:30Showing 6 changed files
- Dockerfile
- Dockerfile.aarch64
- Dockerfile.armhf
- Dockerfile.ppc64le
- Dockerfile.s390x
- integration-cli/docker_cli_build_test.go
| ... | ... |
@@ -235,11 +235,11 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker |
| 235 | 235 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
| 236 | 236 |
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
| 237 | 237 |
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 238 |
- buildpack-deps:jessie@sha256:25785f89240fbcdd8a74bdaf30dd5599a9523882c6dfc567f2e9ef7cf6f79db6 \ |
|
| 239 |
- busybox:latest@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0 \ |
|
| 240 |
- debian:jessie@sha256:f968f10b4b523737e253a97eac59b0d1420b5c19b69928d35801a6373ffe330e \ |
|
| 241 |
- hello-world:latest@sha256:8be990ef2aeb16dbcb9271ddfe2610fa6658d13f6dfb8bc72074cc1ca36966a7 |
|
| 242 |
-# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) |
|
| 238 |
+ buildpack-deps:jessie@sha256:85b379ec16065e4fe4127eb1c5fb1bcc03c559bd36dbb2e22ff496de55925fa6 \ |
|
| 239 |
+ busybox:latest@sha256:32f093055929dbc23dec4d03e09dfe971f5973a9ca5cf059cbfb644c206aa83f \ |
|
| 240 |
+ debian:jessie@sha256:72f784399fd2719b4cb4e16ef8e369a39dc67f53d978cd3e2e7bf4e502c7b793 \ |
|
| 241 |
+ hello-world:latest@sha256:c5515758d4c5e1e838e9cd307f6c6a0d620b5e07e6f927b07d05f6d12a1ac8d7 |
|
| 242 |
+# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
|
| 243 | 243 |
|
| 244 | 244 |
# Install tomlv, vndr, runc, containerd, tini, docker-proxy |
| 245 | 245 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| ... | ... |
@@ -182,11 +182,11 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker |
| 182 | 182 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
| 183 | 183 |
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
| 184 | 184 |
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 185 |
- aarch64/buildpack-deps:jessie@sha256:6aa1d6910791b7ac78265fd0798e5abd6cb3f27ae992f6f960f6c303ec9535f2 \ |
|
| 186 |
- aarch64/busybox:latest@sha256:b23a6a37cf269dff6e46d2473b6e227afa42b037e6d23435f1d2bc40fc8c2828 \ |
|
| 187 |
- aarch64/debian:jessie@sha256:4be74a41a7c70ebe887b634b11ffe516cf4fcd56864a54941e56bb49883c3170 \ |
|
| 188 |
- aarch64/hello-world:latest@sha256:65a4a158587b307bb02db4de41b836addb0c35175bdc801367b1ac1ddeb9afda |
|
| 189 |
-# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) |
|
| 185 |
+ aarch64/buildpack-deps:jessie@sha256:107f4a96837ed89c493fc205cd28508ed0b6b680b4bf3e514e9f0fa0f6667b77 \ |
|
| 186 |
+ aarch64/busybox:latest@sha256:5a06b8b2fdf22dd1f4085c6c3efd23ee99af01b2d668d286bc4be6d8baa10efb \ |
|
| 187 |
+ aarch64/debian:jessie@sha256:e6f90b568631705bd5cb27490977378ba762792b38d47c91c4da7a539f63079a \ |
|
| 188 |
+ aarch64/hello-world:latest@sha256:bd1722550b97668b23ede297abf824d4855f4d9f600dab7b4db1a963dae7ec9e |
|
| 189 |
+# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
|
| 190 | 190 |
|
| 191 | 191 |
# Install tomlv, vndr, runc, containerd, tini, docker-proxy |
| 192 | 192 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| ... | ... |
@@ -163,11 +163,11 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker |
| 163 | 163 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
| 164 | 164 |
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
| 165 | 165 |
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 166 |
- armhf/buildpack-deps:jessie@sha256:ca6cce8e5bf5c952129889b5cc15cd6aa8d995d77e55e3749bbaadae50e476cb \ |
|
| 167 |
- armhf/busybox:latest@sha256:d98a7343ac750ffe387e3d514f8521ba69846c216778919b01414b8617cfb3d4 \ |
|
| 168 |
- armhf/debian:jessie@sha256:4a2187483f04a84f9830910fe3581d69b3c985cc045d9f01d8e2f3795b28107b \ |
|
| 169 |
- armhf/hello-world:latest@sha256:161dcecea0225975b2ad5f768058212c1e0d39e8211098666ffa1ac74cfb7791 |
|
| 170 |
-# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) |
|
| 166 |
+ armhf/buildpack-deps:jessie@sha256:eb2dad77ef53e88d94c3c83862d315c806ea1ca49b6e74f4db362381365ce489 \ |
|
| 167 |
+ armhf/busybox:latest@sha256:016a1e149d2acc2a3789a160dfa60ce870794eea27ad5e96f7a101970e5e1689 \ |
|
| 168 |
+ armhf/debian:jessie@sha256:ac59fa18b28d0ef751eabb5ba4c4b5a9063f99398bae2f70495aa8ed6139b577 \ |
|
| 169 |
+ armhf/hello-world:latest@sha256:9701edc932223a66e49dd6c894a11db8c2cf4eccd1414f1ec105a623bf16b426 |
|
| 170 |
+# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
|
| 171 | 171 |
|
| 172 | 172 |
# Install tomlv, vndr, runc, containerd, tini, docker-proxy |
| 173 | 173 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| ... | ... |
@@ -169,11 +169,11 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker |
| 169 | 169 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
| 170 | 170 |
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
| 171 | 171 |
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 172 |
- ppc64le/buildpack-deps:jessie@sha256:902bfe4ef1389f94d143d64516dd50a2de75bca2e66d4a44b1d73f63ddf05dda \ |
|
| 173 |
- ppc64le/busybox:latest@sha256:38bb82085248d5a3c24bd7a5dc146f2f2c191e189da0441f1c2ca560e3fc6f1b \ |
|
| 174 |
- ppc64le/debian:jessie@sha256:412845f51b6ab662afba71bc7a716e20fdb9b84f185d180d4c7504f8a75c4f91 \ |
|
| 175 |
- ppc64le/hello-world:latest@sha256:186a40a9a02ca26df0b6c8acdfb8ac2f3ae6678996a838f977e57fac9d963974 |
|
| 176 |
-# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) |
|
| 172 |
+ ppc64le/buildpack-deps:jessie@sha256:1a2f2d2cc8738f14b336aeffc3503b5c9dedf9e1f26c7313cb4999534ad4716f \ |
|
| 173 |
+ ppc64le/busybox:latest@sha256:54f34c83adfab20cf0e630d879e210f07b0062cd6caaf16346a61396d50e7584 \ |
|
| 174 |
+ ppc64le/debian:jessie@sha256:ea8c5b105e3790f075145b40e4be1e4488c9f33f55e6cc45182047b80a68f892 \ |
|
| 175 |
+ ppc64le/hello-world:latest@sha256:7d57adf137665f748956c86089320710b66d08584db3500ed98f4bb3da637c2d |
|
| 176 |
+# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
|
| 177 | 177 |
|
| 178 | 178 |
# Install tomlv, vndr, runc, containerd, tini, docker-proxy |
| 179 | 179 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| ... | ... |
@@ -162,11 +162,11 @@ RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker |
| 162 | 162 |
# Get useful and necessary Hub images so we can "docker load" locally instead of pulling |
| 163 | 163 |
COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/ |
| 164 | 164 |
RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ |
| 165 |
- s390x/buildpack-deps:jessie@sha256:4d1381224acaca6c4bfe3604de3af6972083a8558a99672cb6989c7541780099 \ |
|
| 166 |
- s390x/busybox:latest@sha256:dd61522c983884a66ed72d60301925889028c6d2d5e0220a8fe1d9b4c6a4f01b \ |
|
| 167 |
- s390x/debian:jessie@sha256:b74c863400909eff3c5e196cac9bfd1f6333ce47aae6a38398d87d5875da170a \ |
|
| 168 |
- s390x/hello-world:latest@sha256:780d80b3a7677c3788c0d5cd9168281320c8d4a6d9183892d8ee5cdd610f5699 |
|
| 169 |
-# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) |
|
| 165 |
+ s390x/buildpack-deps:jessie@sha256:552dec28146e4d2591fc0309aebdbac9e4fb1f335d90c70a14bbf72fb8bb1be5 \ |
|
| 166 |
+ s390x/busybox:latest@sha256:e32f40c39ca596a4317392bd32809bb188c4ae5864ea827c3219c75c50069964 \ |
|
| 167 |
+ s390x/debian:jessie@sha256:6994e3ffa5a1dabea09d536f350b3ed2715292cb469417c42a82b70fcbff7d32 \ |
|
| 168 |
+ s390x/hello-world:latest@sha256:602db500fee63934292260e65c0c528128ad1c1c7c6497f95bbbac7d4d5312f1 |
|
| 169 |
+# See also ensureFrozenImagesLinux() in "integration-cli/fixtures_linux_daemon_test.go" (which needs to be updated when adding images to this list) |
|
| 170 | 170 |
|
| 171 | 171 |
# Install tomlv, vndr, runc, containerd, tini, docker-proxy |
| 172 | 172 |
# Please edit hack/dockerfile/install-binaries.sh to update them. |
| ... | ... |
@@ -5816,7 +5816,7 @@ func (s *DockerSuite) TestBuildSquashParent(c *check.C) {
|
| 5816 | 5816 |
c.Assert(len(splitTestHistory), checker.Equals, len(splitOrigHistory)+1) |
| 5817 | 5817 |
|
| 5818 | 5818 |
out = inspectImage(c, id, "len .RootFS.Layers") |
| 5819 |
- c.Assert(strings.TrimSpace(out), checker.Equals, "3") |
|
| 5819 |
+ c.Assert(strings.TrimSpace(out), checker.Equals, "2") |
|
| 5820 | 5820 |
} |
| 5821 | 5821 |
|
| 5822 | 5822 |
func (s *DockerSuite) TestBuildContChar(c *check.C) {
|