-
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 #8472
Merged
Merged
Update docker #8472
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@4f5b0cb: Update to 19.03.13-beta1
Diff for 52e59b2:diff --git a/_bashbrew-cat b/_bashbrew-cat
index c034727..e81c979 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,21 +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.12, 19.03, 19, stable, test, latest
+Tags: 19.03.12, 19.03, 19, stable, latest
Architectures: amd64, arm32v6, arm32v7, arm64v8
GitCommit: 86f7f4b563c7c6fe4620c5a8d82694a78f41989f
Directory: 19.03
-Tags: 19.03.12-dind, 19.03-dind, 19-dind, stable-dind, test-dind, dind
+Tags: 19.03.12-dind, 19.03-dind, 19-dind, stable-dind, dind
Architectures: amd64, arm32v6, arm32v7, arm64v8
GitCommit: 93c19dff54de9876f736b3aa8026be5ad5987388
Directory: 19.03/dind
-Tags: 19.03.12-dind-rootless, 19.03-dind-rootless, 19-dind-rootless, stable-dind-rootless, test-dind-rootless, dind-rootless
+Tags: 19.03.12-dind-rootless, 19.03-dind-rootless, 19-dind-rootless, stable-dind-rootless, dind-rootless
GitCommit: 399f205733e0162fe6f6529fad8f2231b843606e
Directory: 19.03/dind-rootless
-Tags: 19.03.12-git, 19.03-git, 19-git, stable-git, test-git, git
+Tags: 19.03.12-git, 19.03-git, 19-git, stable-git, git
Architectures: amd64, arm32v6, arm32v7, arm64v8
GitCommit: 7a67842e7ff12c1426ae6a67ac1b7a701b51f3df
Directory: 19.03/git
+
+Tags: 19.03.13-beta1, 19.03-rc, rc, test
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: 4f5b0cb5438527c6913a943ae07b4d2b1eaa8393
+Directory: 19.03-rc
+
+Tags: 19.03.13-beta1-dind, 19.03-rc-dind, rc-dind, test-dind
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: 4f5b0cb5438527c6913a943ae07b4d2b1eaa8393
+Directory: 19.03-rc/dind
+
+Tags: 19.03.13-beta1-dind-rootless, 19.03-rc-dind-rootless, rc-dind-rootless, test-dind-rootless
+GitCommit: 399f205733e0162fe6f6529fad8f2231b843606e
+Directory: 19.03-rc/dind-rootless
+
+Tags: 19.03.13-beta1-git, 19.03-rc-git, rc-git, test-git
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: 7a67842e7ff12c1426ae6a67ac1b7a701b51f3df
+Directory: 19.03-rc/git
diff --git a/_bashbrew-list b/_bashbrew-list
index 8d18373..abfc178 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,14 +6,26 @@ docker:19.03
docker:19.03-dind
docker:19.03-dind-rootless
docker:19.03-git
+docker:19.03-rc
+docker:19.03-rc-dind
+docker:19.03-rc-dind-rootless
+docker:19.03-rc-git
docker:19.03.12
docker:19.03.12-dind
docker:19.03.12-dind-rootless
docker:19.03.12-git
+docker:19.03.13-beta1
+docker:19.03.13-beta1-dind
+docker:19.03.13-beta1-dind-rootless
+docker:19.03.13-beta1-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
diff --git a/docker_dind-rootless/Dockerfile b/docker_test-dind-rootless/Dockerfile
similarity index 99%
copy from docker_dind-rootless/Dockerfile
copy to docker_test-dind-rootless/Dockerfile
index e9f8cfc..7b974d0 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_test-dind-rootless/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:19.03-dind
+FROM docker:19.03-rc-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
diff --git a/docker_dind/Dockerfile b/docker_test-dind/Dockerfile
similarity index 98%
copy from docker_dind/Dockerfile
copy to docker_test-dind/Dockerfile
index 37bcfa7..563c07d 100644
--- a/docker_dind/Dockerfile
+++ b/docker_test-dind/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:19.03
+FROM docker:19.03-rc
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
RUN set -eux; \
diff --git a/docker_dind/dockerd-entrypoint.sh b/docker_test-dind/dockerd-entrypoint.sh
similarity index 100%
copy from docker_dind/dockerd-entrypoint.sh
copy to docker_test-dind/dockerd-entrypoint.sh
diff --git a/docker_git/Dockerfile b/docker_test-git/Dockerfile
similarity index 57%
copy from docker_git/Dockerfile
copy to docker_test-git/Dockerfile
index 2c8edb9..88183ef 100644
--- a/docker_git/Dockerfile
+++ b/docker_test-git/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker:19.03
+FROM docker:19.03-rc
RUN apk add --no-cache git
diff --git a/docker_latest/Dockerfile b/docker_test/Dockerfile
similarity index 97%
copy from docker_latest/Dockerfile
copy to docker_test/Dockerfile
index e5873be..42804f6 100644
--- a/docker_latest/Dockerfile
+++ b/docker_test/Dockerfile
@@ -11,8 +11,8 @@ 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_CHANNEL stable
-ENV DOCKER_VERSION 19.03.12
+ENV DOCKER_CHANNEL test
+ENV DOCKER_VERSION 19.03.13-beta1
# 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_latest/docker-entrypoint.sh b/docker_test/docker-entrypoint.sh
similarity index 100%
copy from docker_latest/docker-entrypoint.sh
copy to docker_test/docker-entrypoint.sh
diff --git a/docker_latest/modprobe.sh b/docker_test/modprobe.sh
similarity index 100%
copy from docker_latest/modprobe.sh
copy to docker_test/modprobe.sh |
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: