-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update docker #6580
Merged
Merged
Update docker #6580
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/docker@f656a3c: Update to 18.09.9
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 638f917..e51022f 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -23,15 +23,3 @@ docker:latest @ amd64
docker:latest @ arm32v6
docker:latest @ arm32v7
docker:latest @ arm64v8
-docker:rc @ amd64
-docker:rc @ arm32v6
-docker:rc @ arm32v7
-docker:rc @ arm64v8
-docker:rc-dind @ amd64
-docker:rc-dind @ arm32v6
-docker:rc-dind @ arm32v7
-docker:rc-dind @ arm64v8
-docker:rc-git @ amd64
-docker:rc-git @ arm32v6
-docker:rc-git @ arm32v7
-docker:rc-git @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 1a90c08..6aaf743 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,15 +4,9 @@ docker:18-git
docker:18.09
docker:18.09-dind
docker:18.09-git
-docker:18.09-rc
-docker:18.09-rc-dind
-docker:18.09-rc-git
-docker:18.09.8
-docker:18.09.8-dind
-docker:18.09.8-git
-docker:18.09.9-rc1
-docker:18.09.9-rc1-dind
-docker:18.09.9-rc1-git
+docker:18.09.9
+docker:18.09.9-dind
+docker:18.09.9-git
docker:19
docker:19-dind
docker:19-dind-rootless
@@ -29,9 +23,6 @@ docker:dind
docker:dind-rootless
docker:git
docker:latest
-docker:rc
-docker:rc-dind
-docker:rc-git
docker:stable
docker:stable-dind
docker:stable-dind-rootless
diff --git a/docker_18/Dockerfile b/docker_18/Dockerfile
index 9ced0da..cd26792 100644
--- a/docker_18/Dockerfile
+++ b/docker_18/Dockerfile
@@ -10,7 +10,7 @@ RUN apk add --no-cache \
RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
ENV DOCKER_CHANNEL stable
-ENV DOCKER_VERSION 18.09.8
+ENV DOCKER_VERSION 18.09.9
# TODO ENV DOCKER_SHA256
# https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
# (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)
diff --git a/docker_rc-dind/Dockerfile b/docker_rc-dind/Dockerfile
deleted file mode 100644
index 06dd28b..0000000
diff --git a/docker_rc-dind/dockerd-entrypoint.sh b/docker_rc-dind/dockerd-entrypoint.sh
deleted file mode 100755
index 8015b39..0000000
diff --git a/docker_rc-git/Dockerfile b/docker_rc-git/Dockerfile
deleted file mode 100644
index 86d7ffa..0000000
diff --git a/docker_rc/Dockerfile b/docker_rc/Dockerfile
deleted file mode 100644
index a912ced..0000000
diff --git a/docker_rc/docker-entrypoint.sh b/docker_rc/docker-entrypoint.sh
deleted file mode 100755
index d41cef8..0000000
diff --git a/docker_rc/modprobe.sh b/docker_rc/modprobe.sh
deleted file mode 100755
index b357d89..0000000 |
Build test of #6580; 3f867e9; $ bashbrew build docker:19.03.2
Using bashbrew/cache:96f0f83fe783e94d22a6208fceaa90f8edaf29dd7ce3c3fd60dd9a968730c98f (docker:19.03.2)
Tagging docker:19.03.2
Tagging docker:19.03
Tagging docker:19
Tagging docker:stable
Tagging docker:test
Tagging docker:latest
$ test/run.sh docker:19.03.2
testing docker:19.03.2
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:19.03.2-dind
Using bashbrew/cache:f9d69c3e436bd03e9ac04a1df4e729f392cbb706054cf7ba62939a86d815e91a (docker:19.03.2-dind)
Tagging docker:19.03.2-dind
Tagging docker:19.03-dind
Tagging docker:19-dind
Tagging docker:stable-dind
Tagging docker:test-dind
Tagging docker:dind
$ test/run.sh docker:19.03.2-dind
testing docker:19.03.2-dind
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...passed
'override-cmd' [4/6]...passed
'docker-dind' [5/6]....passed
'docker-registry-push-pull' [6/6].....passed
$ bashbrew build docker:19.03.2-dind-rootless
Using bashbrew/cache:afc10fb0c77aa3f7cda59ab881b7ecaed80fb7cb9df3bfe6df728e96321e6090 (docker:19.03.2-dind-rootless)
Tagging docker:19.03.2-dind-rootless
Tagging docker:19.03-dind-rootless
Tagging docker:19-dind-rootless
Tagging docker:stable-dind-rootless
Tagging docker:test-dind-rootless
Tagging docker:dind-rootless
$ test/run.sh docker:19.03.2-dind-rootless
testing docker:19.03.2-dind-rootless
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:19.03.2-git
Using bashbrew/cache:1733a6699c19180fa2c9db576c7f65e0086253786717ce93a28077fca4f1b828 (docker:19.03.2-git)
Tagging docker:19.03.2-git
Tagging docker:19.03-git
Tagging docker:19-git
Tagging docker:stable-git
Tagging docker:test-git
Tagging docker:git
$ test/run.sh docker:19.03.2-git
testing docker:19.03.2-git
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:18.09.9
Building bashbrew/cache:dd08505d162b4a9291ed94f00c6c2fb75888c8f2c9dd0de1d4bd845790311056 (docker:18.09.9)
Tagging docker:18.09.9
Tagging docker:18.09
Tagging docker:18
$ test/run.sh docker:18.09.9
testing docker:18.09.9
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
$ bashbrew build docker:18.09.9-dind
Building bashbrew/cache:4751f0ef9e20564616326eeb9f9c4d8896740485f911b2fbe02ece15ec0a165f (docker:18.09.9-dind)
Tagging docker:18.09.9-dind
Tagging docker:18.09-dind
Tagging docker:18-dind
$ test/run.sh docker:18.09.9-dind
testing docker:18.09.9-dind
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...passed
'override-cmd' [4/6]...passed
'docker-dind' [5/6].....passed
'docker-registry-push-pull' [6/6]....passed
$ bashbrew build docker:18.09.9-git
Building bashbrew/cache:5a28732fee13a91f5d6c60cd3d3ee76114dd1ea7ed7a20f56d78937f951422ba (docker:18.09.9-git)
Tagging docker:18.09.9-git
Tagging docker:18.09-git
Tagging docker:18-git
$ test/run.sh docker:18.09.9-git
testing docker:18.09.9-git
'utc' [1/4]...passed
'cve-2014--shellshock' [2/4]...passed
'no-hard-coded-passwords' [3/4]...passed
'override-cmd' [4/4]...passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: