Update docker #9253
Merged
Update docker #9253
Conversation
This file contains hidden or 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@cf8718b: Merge pull request docker-library/docker#276 from infosiftr/20.10 - docker-library/docker@40e904c: Add missing gitattributes file - docker-library/docker@387e351: Update to 20.10.0 (GA)
Diff for 1f9510d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 63203f1..5a033ff 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,40 +1,40 @@
Maintainers: Tianon Gravi <tianon@dockerproject.org> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/docker.git
-Tags: 19.03.14, 19.03, 19, stable, latest
+Tags: 19.03.14, 19.03, 19
Architectures: amd64, arm32v6, arm32v7, arm64v8
GitCommit: c8b077bfbab07a33ba5c80e5d4987fba8bbdd67b
Directory: 19.03
-Tags: 19.03.14-dind, 19.03-dind, 19-dind, stable-dind, dind
+Tags: 19.03.14-dind, 19.03-dind, 19-dind
Architectures: amd64, arm32v6, arm32v7, arm64v8
GitCommit: b1d2628005e12e79079c025c3653cba248d6f264
Directory: 19.03/dind
-Tags: 19.03.14-dind-rootless, 19.03-dind-rootless, 19-dind-rootless, stable-dind-rootless, dind-rootless
+Tags: 19.03.14-dind-rootless, 19.03-dind-rootless, 19-dind-rootless
GitCommit: c8b077bfbab07a33ba5c80e5d4987fba8bbdd67b
Directory: 19.03/dind-rootless
-Tags: 19.03.14-git, 19.03-git, 19-git, stable-git, git
+Tags: 19.03.14-git, 19.03-git, 19-git
Architectures: amd64, arm32v6, arm32v7, arm64v8
GitCommit: 12d1c2763b54d29137ec448a3e4ad1a9aefae1a0
Directory: 19.03/git
-Tags: 20.10.0-rc2, 20.10-rc, rc
+Tags: 20.10.0, 20.10, 20, latest
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: bf1c9f5393c9c60460567a8e8bdf1b0d0e41acbc
-Directory: 20.10-rc
+GitCommit: 387e351394bfad74bceebf8303c6c8e39c3d4ed4
+Directory: 20.10
-Tags: 20.10.0-rc2-dind, 20.10-rc-dind, rc-dind
+Tags: 20.10.0-dind, 20.10-dind, 20-dind, dind
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: b1d2628005e12e79079c025c3653cba248d6f264
-Directory: 20.10-rc/dind
+GitCommit: 387e351394bfad74bceebf8303c6c8e39c3d4ed4
+Directory: 20.10/dind
-Tags: 20.10.0-rc2-dind-rootless, 20.10-rc-dind-rootless, rc-dind-rootless
-GitCommit: bf1c9f5393c9c60460567a8e8bdf1b0d0e41acbc
-Directory: 20.10-rc/dind-rootless
+Tags: 20.10.0-dind-rootless, 20.10-dind-rootless, 20-dind-rootless, dind-rootless
+GitCommit: 387e351394bfad74bceebf8303c6c8e39c3d4ed4
+Directory: 20.10/dind-rootless
-Tags: 20.10.0-rc2-git, 20.10-rc-git, rc-git
+Tags: 20.10.0-git, 20.10-git, 20-git, git
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: b6597f7fc1294f4ee3345576f06889d2ff773a8d
-Directory: 20.10-rc/git
+GitCommit: 387e351394bfad74bceebf8303c6c8e39c3d4ed4
+Directory: 20.10/git
diff --git a/_bashbrew-list b/_bashbrew-list
index c241a1d..d2ba9ea 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,23 +10,19 @@ docker:19.03.14
docker:19.03.14-dind
docker:19.03.14-dind-rootless
docker:19.03.14-git
-docker:20.10-rc
-docker:20.10-rc-dind
-docker:20.10-rc-dind-rootless
-docker:20.10-rc-git
-docker:20.10.0-rc2
-docker:20.10.0-rc2-dind
-docker:20.10.0-rc2-dind-rootless
-docker:20.10.0-rc2-git
+docker:20
+docker:20-dind
+docker:20-dind-rootless
+docker:20-git
+docker:20.10
+docker:20.10-dind
+docker:20.10-dind-rootless
+docker:20.10-git
+docker:20.10.0
+docker:20.10.0-dind
+docker:20.10.0-dind-rootless
+docker:20.10.0-git
docker:dind
docker:dind-rootless
docker:git
docker:latest
-docker:rc
-docker:rc-dind
-docker:rc-dind-rootless
-docker:rc-git
-docker:stable
-docker:stable-dind
-docker:stable-dind-rootless
-docker:stable-git
diff --git a/docker_dind-rootless/Dockerfile b/docker_19-dind-rootless/Dockerfile
similarity index 100%
copy from docker_dind-rootless/Dockerfile
copy to docker_19-dind-rootless/Dockerfile
diff --git a/docker_dind/Dockerfile b/docker_19-dind/Dockerfile
similarity index 100%
copy from docker_dind/Dockerfile
copy to docker_19-dind/Dockerfile
diff --git a/docker_rc-dind/dockerd-entrypoint.sh b/docker_19-dind/dockerd-entrypoint.sh
similarity index 100%
rename from docker_rc-dind/dockerd-entrypoint.sh
rename to docker_19-dind/dockerd-entrypoint.sh
diff --git a/docker_git/Dockerfile b/docker_19-git/Dockerfile
similarity index 100%
copy from docker_git/Dockerfile
copy to docker_19-git/Dockerfile
diff --git a/docker_latest/Dockerfile b/docker_19/Dockerfile
similarity index 100%
copy from docker_latest/Dockerfile
copy to docker_19/Dockerfile
diff --git a/docker_rc/docker-entrypoint.sh b/docker_19/docker-entrypoint.sh
similarity index 100%
rename from docker_rc/docker-entrypoint.sh
rename to docker_19/docker-entrypoint.sh
diff --git a/docker_rc/modprobe.sh b/docker_19/modprobe.sh
similarity index 100%
rename from docker_rc/modprobe.sh
rename to docker_19/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index 2595dbf..a2a741b 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_dind-rootless/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM docker:19.03-dind
+FROM docker:20.10-dind
# busybox "ip" is insufficient:
# [rootlesskit:child ] error: executing [[ip tuntap add name tap0 mode tap] [ip link set tap0 address 02:50:00:00:00:01]]: exit status 1
@@ -24,7 +24,7 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-19.03.14.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.0.tgz'; \
;; \
*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_dind/Dockerfile b/docker_dind/Dockerfile
index dc580c2..3c02f48 100644
--- a/docker_dind/Dockerfile
+++ b/docker_dind/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM docker:19.03
+FROM docker:20.10
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN set -eux; \
diff --git a/docker_git/Dockerfile b/docker_git/Dockerfile
index 5fa563b..d23654f 100644
--- a/docker_git/Dockerfile
+++ b/docker_git/Dockerfile
@@ -4,6 +4,6 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM docker:19.03
+FROM docker:20.10
RUN apk add --no-cache git
diff --git a/docker_latest/Dockerfile b/docker_latest/Dockerfile
index d8c79f2..51fc4f4 100644
--- a/docker_latest/Dockerfile
+++ b/docker_latest/Dockerfile
@@ -17,7 +17,7 @@ RUN apk add --no-cache \
# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
-ENV DOCKER_VERSION 19.03.14
+ENV DOCKER_VERSION 20.10.0
# 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)
@@ -27,16 +27,16 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-19.03.14.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.0.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-19.03.14.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-20.10.0.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-19.03.14.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.0.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-19.03.14.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.0.tgz'; \
;; \
*) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_rc-dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
deleted file mode 100644
index 865c211..0000000
diff --git a/docker_rc-dind/Dockerfile b/docker_rc-dind/Dockerfile
deleted file mode 100644
index 084c12d..0000000
diff --git a/docker_rc-git/Dockerfile b/docker_rc-git/Dockerfile
deleted file mode 100644
index 11f2c2e..0000000
diff --git a/docker_rc/Dockerfile b/docker_rc/Dockerfile
deleted file mode 100644
index 0e1ab7a..0000000
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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: