Skip to content
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 #14467

Merged
merged 1 commit into from
Apr 17, 2023
Merged

Update docker #14467

merged 1 commit into from
Apr 17, 2023

Conversation

yosifkit
Copy link
Member

Changes:

Changes:

- docker-library/docker@eecbbc8: Update 23.0 to 23.0.4
@github-actions
Copy link

Diff for 8b52c99:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8485f0b..0d3e7b9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -38,38 +38,38 @@ Directory: 20.10/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 23.0.3-cli, 23.0-cli, 23-cli, cli, 23.0.3-cli-alpine3.17
+Tags: 23.0.4-cli, 23.0-cli, 23-cli, cli, 23.0.4-cli-alpine3.17
 Architectures: amd64, arm64v8
-GitCommit: 3f5aa9dfb44948d1493342e168a1d5d650b45bd7
+GitCommit: eecbbc8f7b16d13acb17e350df03f435763c3caa
 Directory: 23.0/cli
 
-Tags: 23.0.3-dind, 23.0-dind, 23-dind, dind, 23.0.3-dind-alpine3.17, 23.0.3, 23.0, 23, latest, 23.0.3-alpine3.17
+Tags: 23.0.4-dind, 23.0-dind, 23-dind, dind, 23.0.4-dind-alpine3.17, 23.0.4, 23.0, 23, latest, 23.0.4-alpine3.17
 Architectures: amd64, arm64v8
-GitCommit: 3f5aa9dfb44948d1493342e168a1d5d650b45bd7
+GitCommit: eecbbc8f7b16d13acb17e350df03f435763c3caa
 Directory: 23.0/dind
 
-Tags: 23.0.3-dind-rootless, 23.0-dind-rootless, 23-dind-rootless, dind-rootless
+Tags: 23.0.4-dind-rootless, 23.0-dind-rootless, 23-dind-rootless, dind-rootless
 Architectures: amd64, arm64v8
-GitCommit: 3f5aa9dfb44948d1493342e168a1d5d650b45bd7
+GitCommit: eecbbc8f7b16d13acb17e350df03f435763c3caa
 Directory: 23.0/dind-rootless
 
-Tags: 23.0.3-git, 23.0-git, 23-git, git
+Tags: 23.0.4-git, 23.0-git, 23-git, git
 Architectures: amd64, arm64v8
 GitCommit: 849b56e6c81dc509da780121352f844e8f26bb7a
 Directory: 23.0/git
 
-Tags: 23.0.3-windowsservercore-1809, 23.0-windowsservercore-1809, 23-windowsservercore-1809, windowsservercore-1809
-SharedTags: 23.0.3-windowsservercore, 23.0-windowsservercore, 23-windowsservercore, windowsservercore
+Tags: 23.0.4-windowsservercore-1809, 23.0-windowsservercore-1809, 23-windowsservercore-1809, windowsservercore-1809
+SharedTags: 23.0.4-windowsservercore, 23.0-windowsservercore, 23-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 3f5aa9dfb44948d1493342e168a1d5d650b45bd7
+GitCommit: eecbbc8f7b16d13acb17e350df03f435763c3caa
 Directory: 23.0/windows/windowsservercore-1809
 Builder: classic
 Constraints: windowsservercore-1809
 
-Tags: 23.0.3-windowsservercore-ltsc2022, 23.0-windowsservercore-ltsc2022, 23-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 23.0.3-windowsservercore, 23.0-windowsservercore, 23-windowsservercore, windowsservercore
+Tags: 23.0.4-windowsservercore-ltsc2022, 23.0-windowsservercore-ltsc2022, 23-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 23.0.4-windowsservercore, 23.0-windowsservercore, 23-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 3f5aa9dfb44948d1493342e168a1d5d650b45bd7
+GitCommit: eecbbc8f7b16d13acb17e350df03f435763c3caa
 Directory: 23.0/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 62cb42f..cdfd5d6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -41,17 +41,17 @@ docker:23.0-git
 docker:23.0-windowsservercore
 docker:23.0-windowsservercore-1809
 docker:23.0-windowsservercore-ltsc2022
-docker:23.0.3
-docker:23.0.3-alpine3.17
-docker:23.0.3-cli
-docker:23.0.3-cli-alpine3.17
-docker:23.0.3-dind
-docker:23.0.3-dind-alpine3.17
-docker:23.0.3-dind-rootless
-docker:23.0.3-git
-docker:23.0.3-windowsservercore
-docker:23.0.3-windowsservercore-1809
-docker:23.0.3-windowsservercore-ltsc2022
+docker:23.0.4
+docker:23.0.4-alpine3.17
+docker:23.0.4-cli
+docker:23.0.4-cli-alpine3.17
+docker:23.0.4-dind
+docker:23.0.4-dind-alpine3.17
+docker:23.0.4-dind-rootless
+docker:23.0.4-git
+docker:23.0.4-windowsservercore
+docker:23.0.4-windowsservercore-1809
+docker:23.0.4-windowsservercore-ltsc2022
 docker:24-rc
 docker:24-rc-cli
 docker:24-rc-dind
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 23a3b4e..3bb718c 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -4,8 +4,8 @@ docker:20-dind-rootless
 docker:20-git
 docker:20-windowsservercore-1809
 docker:20-windowsservercore-ltsc2022
-docker:23.0.3-cli-alpine3.17
-docker:23.0.3-alpine3.17
+docker:23.0.4-cli-alpine3.17
+docker:23.0.4-alpine3.17
 docker:dind-rootless
 docker:git
 docker:windowsservercore-1809
diff --git a/docker_23.0.3-alpine3.17/Dockerfile b/docker_23.0.4-alpine3.17/Dockerfile
similarity index 96%
rename from docker_23.0.3-alpine3.17/Dockerfile
rename to docker_23.0.4-alpine3.17/Dockerfile
index b36ea2a..d9b7a6c 100644
--- a/docker_23.0.3-alpine3.17/Dockerfile
+++ b/docker_23.0.4-alpine3.17/Dockerfile
@@ -42,16 +42,16 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.4.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-23.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armel/docker-23.0.4.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.4.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.4.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_23.0.3-alpine3.17/dockerd-entrypoint.sh b/docker_23.0.4-alpine3.17/dockerd-entrypoint.sh
similarity index 100%
rename from docker_23.0.3-alpine3.17/dockerd-entrypoint.sh
rename to docker_23.0.4-alpine3.17/dockerd-entrypoint.sh
diff --git a/docker_23.0.3-cli-alpine3.17/Dockerfile b/docker_23.0.4-cli-alpine3.17/Dockerfile
similarity index 98%
rename from docker_23.0.3-cli-alpine3.17/Dockerfile
rename to docker_23.0.4-cli-alpine3.17/Dockerfile
index 980f524..aaa9553 100644
--- a/docker_23.0.3-cli-alpine3.17/Dockerfile
+++ b/docker_23.0.4-cli-alpine3.17/Dockerfile
@@ -17,23 +17,23 @@ RUN apk add --no-cache \
 # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
 RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf
 
-ENV DOCKER_VERSION 23.0.3
+ENV DOCKER_VERSION 23.0.4
 
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-23.0.4.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-23.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armel/docker-23.0.4.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armhf/docker-23.0.4.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/aarch64/docker-23.0.4.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_23.0.3-cli-alpine3.17/docker-entrypoint.sh b/docker_23.0.4-cli-alpine3.17/docker-entrypoint.sh
similarity index 100%
rename from docker_23.0.3-cli-alpine3.17/docker-entrypoint.sh
rename to docker_23.0.4-cli-alpine3.17/docker-entrypoint.sh
diff --git a/docker_23.0.3-cli-alpine3.17/modprobe.sh b/docker_23.0.4-cli-alpine3.17/modprobe.sh
similarity index 100%
rename from docker_23.0.3-cli-alpine3.17/modprobe.sh
rename to docker_23.0.4-cli-alpine3.17/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index a93f1ed..d608377 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_dind-rootless/Dockerfile
@@ -24,10 +24,10 @@ 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-23.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-23.0.4.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-23.0.4.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_windowsservercore-1809/Dockerfile b/docker_windowsservercore-1809/Dockerfile
index 8b73921..2f836ff 100644
--- a/docker_windowsservercore-1809/Dockerfile
+++ b/docker_windowsservercore-1809/Dockerfile
@@ -15,8 +15,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV DOCKER_VERSION 23.0.3
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.3.zip
+ENV DOCKER_VERSION 23.0.4
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.4.zip
 # 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_windowsservercore-ltsc2022/Dockerfile b/docker_windowsservercore-ltsc2022/Dockerfile
index 0d58254..418e701 100644
--- a/docker_windowsservercore-ltsc2022/Dockerfile
+++ b/docker_windowsservercore-ltsc2022/Dockerfile
@@ -15,8 +15,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV DOCKER_VERSION 23.0.3
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.3.zip
+ENV DOCKER_VERSION 23.0.4
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-23.0.4.zip
 # 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)

Relevant Maintainers:

@tianon tianon merged commit b3a2969 into docker-library:master Apr 17, 2023
@tianon tianon deleted the docker branch April 17, 2023 23:57
@Soupison7

This comment was marked as spam.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants